From 45487d18b476f10ec365714139dd91bef3c62046 Mon Sep 17 00:00:00 2001 From: Roman Elizarov Date: Wed, 22 Apr 2020 14:55:56 +0300 Subject: [PATCH] Migrate to androidx.annotation from legacy android.support.annotion (#1932) --- gradle.properties | 2 +- ui/kotlinx-coroutines-android/android-unit-tests/build.gradle | 1 - ui/kotlinx-coroutines-android/build.gradle | 2 +- ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt | 2 +- ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index daf5b67f44..9b54f4f89b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/ui/kotlinx-coroutines-android/android-unit-tests/build.gradle b/ui/kotlinx-coroutines-android/android-unit-tests/build.gradle index c927640cd7..99759b254c 100644 --- a/ui/kotlinx-coroutines-android/android-unit-tests/build.gradle +++ b/ui/kotlinx-coroutines-android/android-unit-tests/build.gradle @@ -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") diff --git a/ui/kotlinx-coroutines-android/build.gradle b/ui/kotlinx-coroutines-android/build.gradle index 51702cdbe3..6f66e6c5d9 100644 --- a/ui/kotlinx-coroutines-android/build.gradle +++ b/ui/kotlinx-coroutines-android/build.gradle @@ -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" diff --git a/ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt b/ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt index 673c3813d8..b105e5b84c 100644 --- a/ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt +++ b/ui/kotlinx-coroutines-android/src/AndroidExceptionPreHandler.kt @@ -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.* diff --git a/ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt b/ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt index d415b003bf..af1ab4331b 100644 --- a/ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt +++ b/ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt @@ -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.*