Skip to content

Commit 45487d1

Browse files
elizarovqwwdfsad
authored andcommitted
Migrate to androidx.annotation from legacy android.support.annotion (#1932)
1 parent 4589d4c commit 45487d1

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jna_version=5.5.0
2626

2727
# Android versions
2828
android_version=4.1.1.4
29-
android_support_version=26.1.0
29+
androidx_annotation_version=1.1.0
3030
robolectric_version=4.0.2
3131
baksmali_version=2.2.7
3232

ui/kotlinx-coroutines-android/android-unit-tests/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
dependencies {
66
testImplementation "com.google.android:android:$android_version"
7-
testImplementation "com.android.support:support-annotations:$android_support_version"
87
testImplementation "org.robolectric:robolectric:$robolectric_version"
98
testImplementation project(":kotlinx-coroutines-test")
109
testImplementation project(":kotlinx-coroutines-android")

ui/kotlinx-coroutines-android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ configurations {
1212

1313
dependencies {
1414
compileOnly "com.google.android:android:$android_version"
15-
compileOnly "com.android.support:support-annotations:$android_support_version"
15+
compileOnly "androidx.annotation:annotation:$androidx_annotation_version"
1616

1717
testImplementation "com.google.android:android:$android_version"
1818
testImplementation "org.robolectric:robolectric:$robolectric_version"

ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package kotlinx.coroutines.android
66

77
import android.os.*
8-
import android.support.annotation.*
8+
import androidx.annotation.*
99
import kotlinx.coroutines.*
1010
import java.lang.reflect.*
1111
import kotlin.coroutines.*

ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package kotlinx.coroutines.android
88

99
import android.os.*
10-
import android.support.annotation.*
10+
import androidx.annotation.*
1111
import android.view.*
1212
import kotlinx.coroutines.*
1313
import kotlinx.coroutines.internal.*

0 commit comments

Comments
 (0)