Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to androidx.annotation from legacy android.support.annotion #1932

Merged
merged 1 commit into from
Apr 22, 2020
Merged

Migrate to androidx.annotation from legacy android.support.annotion #1932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jna_version=5.5.0

# Android versions
android_version=4.1.1.4
android_support_version=26.1.0
androidx_annotation_version=1.1.0
robolectric_version=4.0.2
baksmali_version=2.2.7

Expand Down
1 change: 0 additions & 1 deletion ui/kotlinx-coroutines-android/android-unit-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

dependencies {
testImplementation "com.google.android:android:$android_version"
testImplementation "com.android.support:support-annotations:$android_support_version"
testImplementation "org.robolectric:robolectric:$robolectric_version"
testImplementation project(":kotlinx-coroutines-test")
testImplementation project(":kotlinx-coroutines-android")
Expand Down
2 changes: 1 addition & 1 deletion ui/kotlinx-coroutines-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ configurations {

dependencies {
compileOnly "com.google.android:android:$android_version"
compileOnly "com.android.support:support-annotations:$android_support_version"
compileOnly "androidx.annotation:annotation:$androidx_annotation_version"

testImplementation "com.google.android:android:$android_version"
testImplementation "org.robolectric:robolectric:$robolectric_version"
Expand Down
2 changes: 1 addition & 1 deletion ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package kotlinx.coroutines.android

import android.os.*
import android.support.annotation.*
import androidx.annotation.*
import kotlinx.coroutines.*
import java.lang.reflect.*
import kotlin.coroutines.*
Expand Down
2 changes: 1 addition & 1 deletion ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package kotlinx.coroutines.android

import android.os.*
import android.support.annotation.*
import androidx.annotation.*
import android.view.*
import kotlinx.coroutines.*
import kotlinx.coroutines.internal.*
Expand Down