aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2019-06-10 20:53:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-06-10 20:53:25 +0000
commit54cc4f9ccfa07267d800c143edc640960e278bc7 (patch)
tree48629fa21217645e537870065d4a3e0421bf0be8
parent41d4c1e9a3ba84142c6828c1796ae919da511ec6 (diff)
parent009f2ecb41b9ca9d9ff509da9cf38316dae8779c (diff)
downloadsupport-54cc4f9ccfa07267d800c143edc640960e278bc7.tar.gz
Merge "Snap for 5633604 from 3cb38c215340dbb822fcd1c303b2f2124c7f68bb to androidx-concurrent-release" into androidx-concurrent-releasesparse-5648109-L26700000332273888
-rw-r--r--activity/activity/build.gradle2
-rw-r--r--animation/build.gradle4
-rw-r--r--animation/integration-tests/testapp/build.gradle2
-rw-r--r--animation/testing/build.gradle2
-rw-r--r--appcompat/build.gradle2
-rw-r--r--appcompat/resources/build.gradle2
-rw-r--r--arch/core-common/build.gradle2
-rw-r--r--arch/core-runtime/build.gradle2
-rw-r--r--arch/core-testing/build.gradle2
-rw-r--r--asynclayoutinflater/build.gradle2
-rw-r--r--browser/build.gradle4
-rw-r--r--buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt8
-rw-r--r--buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt4
-rw-r--r--camera/integration-tests/extensionstestlib/build.gradle2
-rw-r--r--car/cluster/build.gradle2
-rw-r--r--car/core/build.gradle2
-rw-r--r--car/moderator/build.gradle2
-rw-r--r--cardview/build.gradle2
-rw-r--r--collection/build.gradle2
-rw-r--r--collection/ktx/build.gradle2
-rw-r--r--concurrent/futures/build.gradle2
-rw-r--r--concurrent/listenablefuture-callback/build.gradle2
-rw-r--r--content/build.gradle4
-rw-r--r--coordinatorlayout/build.gradle2
-rw-r--r--core/core-ktx/build.gradle2
-rw-r--r--core/core/build.gradle2
-rw-r--r--cursoradapter/build.gradle2
-rw-r--r--customview/build.gradle4
-rw-r--r--documentfile/build.gradle2
-rw-r--r--drawerlayout/build.gradle2
-rw-r--r--dynamic-animation/build.gradle2
-rw-r--r--exifinterface/build.gradle2
-rw-r--r--fragment/build.gradle6
-rw-r--r--graphics/drawable/animated/build.gradle2
-rw-r--r--graphics/drawable/static/build.gradle4
-rw-r--r--heifwriter/build.gradle2
-rw-r--r--interpolator/build.gradle2
-rw-r--r--leanback-preference/build.gradle2
-rw-r--r--leanback/build.gradle2
-rw-r--r--legacy/core-utils/build.gradle2
-rw-r--r--lifecycle/common-java8/build.gradle2
-rw-r--r--lifecycle/common/build.gradle2
-rw-r--r--lifecycle/reactivestreams/build.gradle2
-rw-r--r--lifecycle/runtime/build.gradle2
-rw-r--r--lifecycle/viewmodel/build.gradle2
-rw-r--r--localbroadcastmanager/build.gradle2
-rw-r--r--paging/common/build.gradle2
-rw-r--r--palette/build.gradle2
-rw-r--r--preference/build.gradle2
-rw-r--r--print/build.gradle2
-rw-r--r--recommendation/build.gradle2
-rw-r--r--recyclerview/recyclerview/build.gradle2
-rw-r--r--recyclerview/selection/build.gradle4
-rw-r--r--remotecallback/build.gradle2
-rw-r--r--slices/builders/build.gradle2
-rw-r--r--slices/builders/ktx/build.gradle2
-rw-r--r--slices/core/build.gradle4
-rw-r--r--slices/view/build.gradle2
-rw-r--r--slidingpanelayout/build.gradle2
-rw-r--r--swiperefreshlayout/build.gradle2
-rw-r--r--textclassifier/build.gradle2
-rw-r--r--transition/build.gradle2
-rw-r--r--tv-provider/build.gradle2
-rw-r--r--versionedparcelable/build.gradle2
-rw-r--r--viewpager/build.gradle2
-rw-r--r--viewpager2/build.gradle2
-rw-r--r--wear/build.gradle2
-rw-r--r--webkit/build.gradle2
68 files changed, 81 insertions, 81 deletions
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index a9892e90a11..a0735941e7f 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -20,7 +20,7 @@ android {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01") {
exclude group: 'androidx.annotation'
exclude group: 'com.google.guava', module: 'listenablefuture'
diff --git a/animation/build.gradle b/animation/build.gradle
index d56d30cf509..65781d0fa5a 100644
--- a/animation/build.gradle
+++ b/animation/build.gradle
@@ -25,9 +25,9 @@ plugins {
}
dependencies {
- implementation("androidx.annotation:annotation:1.1.0-rc01")
+ implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.core:core:1.1.0-rc01")
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT, libs.exclude_for_espresso)
androidTestImplementation(ANDROIDX_TEST_RULES, libs.exclude_for_espresso)
diff --git a/animation/integration-tests/testapp/build.gradle b/animation/integration-tests/testapp/build.gradle
index 8560b68f6d4..82a6fe05047 100644
--- a/animation/integration-tests/testapp/build.gradle
+++ b/animation/integration-tests/testapp/build.gradle
@@ -22,7 +22,7 @@ plugins {
}
dependencies {
- implementation("androidx.annotation:annotation:1.1.0-rc01")
+ implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.core:core:1.1.0-rc01")
implementation(project(":animation"))
implementation(project(":animation:testing"))
diff --git a/animation/testing/build.gradle b/animation/testing/build.gradle
index 673da39daaf..f33191e9680 100644
--- a/animation/testing/build.gradle
+++ b/animation/testing/build.gradle
@@ -25,7 +25,7 @@ plugins {
}
dependencies {
- implementation("androidx.annotation:annotation:1.1.0-rc01")
+ implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.core:core:1.1.0-rc01")
implementation(project(":animation"))
implementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/appcompat/build.gradle b/appcompat/build.gradle
index ccd933d03c6..28a906e3288 100644
--- a/appcompat/build.gradle
+++ b/appcompat/build.gradle
@@ -10,7 +10,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
implementation("androidx.collection:collection:1.0.0")
diff --git a/appcompat/resources/build.gradle b/appcompat/resources/build.gradle
index 38192e899f1..e856cb9ca46 100644
--- a/appcompat/resources/build.gradle
+++ b/appcompat/resources/build.gradle
@@ -25,7 +25,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.0.1")
implementation("androidx.collection:collection:1.0.0")
api(project(":vectordrawable"))
diff --git a/arch/core-common/build.gradle b/arch/core-common/build.gradle
index b62149449f1..f075aa021f6 100644
--- a/arch/core-common/build.gradle
+++ b/arch/core-common/build.gradle
@@ -26,7 +26,7 @@ plugins {
}
dependencies {
- compile("androidx.annotation:annotation:1.1.0-rc01")
+ compile("androidx.annotation:annotation:1.1.0")
testCompile(JUNIT)
testCompile(MOCKITO_CORE)
diff --git a/arch/core-runtime/build.gradle b/arch/core-runtime/build.gradle
index 7b6cf5ac78a..483f0256158 100644
--- a/arch/core-runtime/build.gradle
+++ b/arch/core-runtime/build.gradle
@@ -26,7 +26,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api(project(":arch:core-common"))
}
diff --git a/arch/core-testing/build.gradle b/arch/core-testing/build.gradle
index e1a8dd08f82..6f840b996f8 100644
--- a/arch/core-testing/build.gradle
+++ b/arch/core-testing/build.gradle
@@ -27,7 +27,7 @@ plugins {
dependencies {
api(project(":arch:core-runtime"))
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api(JUNIT)
api(MOCKITO_CORE, libs.exclude_bytebuddy)
diff --git a/asynclayoutinflater/build.gradle b/asynclayoutinflater/build.gradle
index ee3b40b22cc..2c12378d487 100644
--- a/asynclayoutinflater/build.gradle
+++ b/asynclayoutinflater/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
}
diff --git a/browser/build.gradle b/browser/build.gradle
index cc949c520a7..74657ee0cd9 100644
--- a/browser/build.gradle
+++ b/browser/build.gradle
@@ -16,9 +16,9 @@ android {
dependencies {
api("androidx.core:core:1.1.0-rc01")
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api(project(":interpolator"))
- api("androidx.collection:collection:1.1.0-rc01")
+ api("androidx.collection:collection:1.1.0")
implementation(project(":concurrent-listenablefuture"))
implementation(project(":concurrent-listenablefuture-callback"))
diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
index b42f831b2c6..216d65cd27f 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryGroups.kt
@@ -25,7 +25,7 @@ object LibraryGroups {
val ANIMATION = LibraryGroup("androidx.animation", false)
val ANNOTATION = LibraryGroup("androidx.annotation")
val APPCOMPAT = LibraryGroup("androidx.appcompat", false)
- val ARCH_CORE = LibraryGroup("androidx.arch.core", false)
+ val ARCH_CORE = LibraryGroup("androidx.arch.core")
val ASYNCLAYOUTINFLATER = LibraryGroup("androidx.asynclayoutinflater")
val AUTOFILL = LibraryGroup("androidx.autofill")
val BIOMETRIC = LibraryGroup("androidx.biometric")
@@ -62,16 +62,16 @@ object LibraryGroups {
val MEDIA2 = LibraryGroup("androidx.media2", false)
val MEDIAROUTER = LibraryGroup("androidx.mediarouter")
val NAVIGATION = LibraryGroup("androidx.navigation")
- val PAGING = LibraryGroup("androidx.paging", false)
+ val PAGING = LibraryGroup("androidx.paging")
val PALETTE = LibraryGroup("androidx.palette")
val PERCENTLAYOUT = LibraryGroup("androidx.percentlayout")
- val PERSISTENCE = LibraryGroup("androidx.sqlite", false)
+ val PERSISTENCE = LibraryGroup("androidx.sqlite")
val PREFERENCE = LibraryGroup("androidx.preference")
val PRINT = LibraryGroup("androidx.print")
val RECOMMENDATION = LibraryGroup("androidx.recommendation")
val RECYCLERVIEW = LibraryGroup("androidx.recyclerview", false)
val REMOTECALLBACK = LibraryGroup("androidx.remotecallback")
- val ROOM = LibraryGroup("androidx.room", false)
+ val ROOM = LibraryGroup("androidx.room")
val SAVEDSTATE = LibraryGroup("androidx.savedstate")
val SECURITY = LibraryGroup("androidx.security", false)
val SHARETARGET = LibraryGroup("androidx.sharetarget")
diff --git a/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt b/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
index bae98b7e472..480f2ba1c9e 100644
--- a/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/PublishDocsRules.kt
@@ -29,7 +29,7 @@ import androidx.build.Strategy.TipOfTree
*/
val RELEASE_RULE = docsRules("public", false) {
prebuilts(LibraryGroups.ACTIVITY, "1.0.0-beta01")
- prebuilts(LibraryGroups.ANNOTATION, "1.1.0-rc01")
+ prebuilts(LibraryGroups.ANNOTATION, "1.1.0")
prebuilts(LibraryGroups.APPCOMPAT, "1.1.0-beta01")
prebuilts(LibraryGroups.ARCH_CORE, "2.1.0-beta01")
prebuilts(LibraryGroups.ASYNCLAYOUTINFLATER, "1.0.0")
@@ -48,7 +48,7 @@ val RELEASE_RULE = docsRules("public", false) {
prebuilts(LibraryGroups.CAR, "car", "1.0.0-alpha7")
.addStubs("car/stubs/android.car.jar")
prebuilts(LibraryGroups.CARDVIEW, "1.0.0")
- prebuilts(LibraryGroups.COLLECTION, "1.1.0-rc01")
+ prebuilts(LibraryGroups.COLLECTION, "1.1.0")
prebuilts(LibraryGroups.CONCURRENT, "concurrent-futures", "1.0.0-beta01")
prebuilts(LibraryGroups.CONTENTPAGER, "1.0.0")
prebuilts(LibraryGroups.COORDINATORLAYOUT, "1.1.0-beta01")
diff --git a/camera/integration-tests/extensionstestlib/build.gradle b/camera/integration-tests/extensionstestlib/build.gradle
index 134f0876e53..5b3c2cfa5ac 100644
--- a/camera/integration-tests/extensionstestlib/build.gradle
+++ b/camera/integration-tests/extensionstestlib/build.gradle
@@ -25,7 +25,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
}
android {
diff --git a/car/cluster/build.gradle b/car/cluster/build.gradle
index dbb7149eeec..4624b3241fd 100644
--- a/car/cluster/build.gradle
+++ b/car/cluster/build.gradle
@@ -26,7 +26,7 @@ plugins {
dependencies {
api(project(":car"))
api("androidx.versionedparcelable:versionedparcelable:1.1.0-rc01")
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
annotationProcessor(project(":versionedparcelable-annotation"))
diff --git a/car/core/build.gradle b/car/core/build.gradle
index 938eb3a572f..1f60ba9c0ee 100644
--- a/car/core/build.gradle
+++ b/car/core/build.gradle
@@ -12,7 +12,7 @@ dependencies {
api(project(":appcompat"))
api("androidx.cardview:cardview:1.0.0")
api("androidx.coordinatorlayout:coordinatorlayout:1.0.0")
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api(project(":recyclerview"))
api("androidx.gridlayout:gridlayout:1.0.0")
api("androidx.preference:preference:1.0.0")
diff --git a/car/moderator/build.gradle b/car/moderator/build.gradle
index 70a21f249ab..4d19dbd9f21 100644
--- a/car/moderator/build.gradle
+++ b/car/moderator/build.gradle
@@ -25,7 +25,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/cardview/build.gradle b/cardview/build.gradle
index e7d1aa9706f..a3d5279b45a 100644
--- a/cardview/build.gradle
+++ b/cardview/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
}
android {
diff --git a/collection/build.gradle b/collection/build.gradle
index ea4d09a4c5c..b24975310a9 100644
--- a/collection/build.gradle
+++ b/collection/build.gradle
@@ -25,7 +25,7 @@ plugins {
}
dependencies {
- compile("androidx.annotation:annotation:1.1.0-rc01")
+ compile("androidx.annotation:annotation:1.1.0")
annotationProcessor(NULLAWAY)
testCompile(JUNIT)
}
diff --git a/collection/ktx/build.gradle b/collection/ktx/build.gradle
index d565af5b98d..bfaea3bd01f 100644
--- a/collection/ktx/build.gradle
+++ b/collection/ktx/build.gradle
@@ -25,7 +25,7 @@ plugins {
}
dependencies {
- compile("androidx.collection:collection:1.1.0-rc01")
+ compile(project(":collection"))
compile(KOTLIN_STDLIB)
testCompile(JUNIT)
testCompile(TRUTH)
diff --git a/concurrent/futures/build.gradle b/concurrent/futures/build.gradle
index 7398b6b6cab..f6794a7f072 100644
--- a/concurrent/futures/build.gradle
+++ b/concurrent/futures/build.gradle
@@ -26,7 +26,7 @@ plugins {
}
dependencies {
- compile("androidx.annotation:annotation:1.1.0-rc01")
+ compile("androidx.annotation:annotation:1.1.0")
compile(GUAVA_LISTENABLE_FUTURE)
testCompile(JUNIT)
testCompile(TRUTH)
diff --git a/concurrent/listenablefuture-callback/build.gradle b/concurrent/listenablefuture-callback/build.gradle
index 6125c533e6f..e18fbe3b65d 100644
--- a/concurrent/listenablefuture-callback/build.gradle
+++ b/concurrent/listenablefuture-callback/build.gradle
@@ -26,7 +26,7 @@ plugins {
}
dependencies {
- compile("androidx.annotation:annotation:1.1.0-rc01")
+ compile("androidx.annotation:annotation:1.1.0")
compile(project(":concurrent-listenablefuture"))
testCompile(JUNIT)
testCompile(TRUTH)
diff --git a/content/build.gradle b/content/build.gradle
index aabc6305864..cafb452db24 100644
--- a/content/build.gradle
+++ b/content/build.gradle
@@ -25,9 +25,9 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
androidTestImplementation(JUNIT)
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/coordinatorlayout/build.gradle b/coordinatorlayout/build.gradle
index 80fc5460510..408631142b7 100644
--- a/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
// TODO: change to 1.1.0-alpha04 after release
api("androidx.core:core:1.1.0-rc01")
implementation("androidx.collection:collection:1.0.0")
diff --git a/core/core-ktx/build.gradle b/core/core-ktx/build.gradle
index 4d250da93aa..1d4de69362b 100644
--- a/core/core-ktx/build.gradle
+++ b/core/core-ktx/build.gradle
@@ -19,7 +19,7 @@ android {
dependencies {
api(KOTLIN_STDLIB)
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api(project(":core:core"))
androidTestImplementation(JUNIT)
diff --git a/core/core/build.gradle b/core/core/build.gradle
index 4becf37a4cc..7b4eec53c90 100644
--- a/core/core/build.gradle
+++ b/core/core/build.gradle
@@ -10,7 +10,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
implementation("androidx.collection:collection:1.0.0")
api(ARCH_LIFECYCLE_RUNTIME, libs.exclude_annotations_transitive)
api("androidx.versionedparcelable:versionedparcelable:1.1.0-rc01")
diff --git a/cursoradapter/build.gradle b/cursoradapter/build.gradle
index 59b5c2bfdcb..8f06ff5513b 100644
--- a/cursoradapter/build.gradle
+++ b/cursoradapter/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
}
androidx {
diff --git a/customview/build.gradle b/customview/build.gradle
index 825963abc71..763aa5995f4 100644
--- a/customview/build.gradle
+++ b/customview/build.gradle
@@ -9,9 +9,9 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
androidTestImplementation(JUNIT)
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/documentfile/build.gradle b/documentfile/build.gradle
index 373a15f1afd..0bf86ae3016 100644
--- a/documentfile/build.gradle
+++ b/documentfile/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
annotationProcessor(NULLAWAY)
diff --git a/drawerlayout/build.gradle b/drawerlayout/build.gradle
index ef772524e05..69ea4676e11 100644
--- a/drawerlayout/build.gradle
+++ b/drawerlayout/build.gradle
@@ -10,7 +10,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
api(project(":customview"))
diff --git a/dynamic-animation/build.gradle b/dynamic-animation/build.gradle
index dec1e39beaa..a9da7a4a18b 100644
--- a/dynamic-animation/build.gradle
+++ b/dynamic-animation/build.gradle
@@ -10,7 +10,7 @@ plugins {
dependencies {
api("androidx.core:core:1.1.0-rc01")
- api("androidx.collection:collection:1.1.0-rc01")
+ api("androidx.collection:collection:1.1.0")
api(project(":legacy-support-core-utils"))
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/exifinterface/build.gradle b/exifinterface/build.gradle
index e0bad818a75..7d775837171 100644
--- a/exifinterface/build.gradle
+++ b/exifinterface/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/fragment/build.gradle b/fragment/build.gradle
index caeaf627eeb..d678f949f7f 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle
@@ -16,13 +16,13 @@ android {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01") {
exclude group: 'androidx.annotation'
}
- api("androidx.collection:collection:1.1.0-rc01")
+ api("androidx.collection:collection:1.1.0")
api("androidx.viewpager:viewpager:1.0.0")
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.loader:loader:1.0.0")
api(project(":activity:activity"))
api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive)
diff --git a/graphics/drawable/animated/build.gradle b/graphics/drawable/animated/build.gradle
index 3003dfdd494..40e2ccd1b02 100644
--- a/graphics/drawable/animated/build.gradle
+++ b/graphics/drawable/animated/build.gradle
@@ -11,7 +11,7 @@ plugins {
dependencies {
api(project(":vectordrawable"))
implementation("androidx.interpolator:interpolator:1.0.0")
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index 48934cf8459..a3e453ad2ec 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle
@@ -9,9 +9,9 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/heifwriter/build.gradle b/heifwriter/build.gradle
index 813efa9ec13..d9912069ba1 100644
--- a/heifwriter/build.gradle
+++ b/heifwriter/build.gradle
@@ -15,7 +15,7 @@ android {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/interpolator/build.gradle b/interpolator/build.gradle
index 267c91e821b..aead3331cdc 100644
--- a/interpolator/build.gradle
+++ b/interpolator/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
}
androidx {
diff --git a/leanback-preference/build.gradle b/leanback-preference/build.gradle
index 3acf91651a7..d91fa0369ef 100644
--- a/leanback-preference/build.gradle
+++ b/leanback-preference/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
implementation("androidx.collection:collection:1.0.0")
api("androidx.appcompat:appcompat:1.0.0")
api("androidx.recyclerview:recyclerview:1.0.0")
diff --git a/leanback/build.gradle b/leanback/build.gradle
index a2989f8c4f9..075cb16b64c 100644
--- a/leanback/build.gradle
+++ b/leanback/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.interpolator:interpolator:1.0.0")
api("androidx.core:core:1.1.0-rc01")
implementation("androidx.collection:collection:1.0.0")
diff --git a/legacy/core-utils/build.gradle b/legacy/core-utils/build.gradle
index d5849729427..e6527fffb73 100644
--- a/legacy/core-utils/build.gradle
+++ b/legacy/core-utils/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
api(project(":documentfile"))
api(project(":loader"))
diff --git a/lifecycle/common-java8/build.gradle b/lifecycle/common-java8/build.gradle
index 38f166fe2ba..2f75c2224be 100644
--- a/lifecycle/common-java8/build.gradle
+++ b/lifecycle/common-java8/build.gradle
@@ -27,7 +27,7 @@ plugins {
dependencies {
compile(project(":lifecycle:lifecycle-common"))
- compile("androidx.annotation:annotation:1.1.0-rc01")
+ compile("androidx.annotation:annotation:1.1.0")
testCompile(JUNIT)
testCompile(MOCKITO_CORE)
diff --git a/lifecycle/common/build.gradle b/lifecycle/common/build.gradle
index b7c3a6e162b..91e34ae7610 100644
--- a/lifecycle/common/build.gradle
+++ b/lifecycle/common/build.gradle
@@ -29,7 +29,7 @@ plugins {
dependencies {
testCompile(JUNIT)
testCompile(MOCKITO_CORE)
- compile("androidx.annotation:annotation:1.1.0-rc01")
+ compile("androidx.annotation:annotation:1.1.0")
}
androidx {
diff --git a/lifecycle/reactivestreams/build.gradle b/lifecycle/reactivestreams/build.gradle
index f52d2b9652b..cc1b7275d68 100644
--- a/lifecycle/reactivestreams/build.gradle
+++ b/lifecycle/reactivestreams/build.gradle
@@ -36,7 +36,7 @@ dependencies {
api(project(":lifecycle:lifecycle-common"))
api(project(":lifecycle:lifecycle-livedata"))
api(project(":lifecycle:lifecycle-runtime"))
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api(REACTIVE_STREAMS)
annotationProcessor(NULLAWAY)
diff --git a/lifecycle/runtime/build.gradle b/lifecycle/runtime/build.gradle
index 92bf42af0db..0e21d7cd755 100644
--- a/lifecycle/runtime/build.gradle
+++ b/lifecycle/runtime/build.gradle
@@ -23,7 +23,7 @@ dependencies {
api(project(":lifecycle:lifecycle-common"))
api(project(":arch:core-common"))
// necessary for IJ to resolve dependencies.
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
diff --git a/lifecycle/viewmodel/build.gradle b/lifecycle/viewmodel/build.gradle
index ba46a27d038..6a1ba4813e3 100644
--- a/lifecycle/viewmodel/build.gradle
+++ b/lifecycle/viewmodel/build.gradle
@@ -36,7 +36,7 @@ android {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
diff --git a/localbroadcastmanager/build.gradle b/localbroadcastmanager/build.gradle
index 3dd491754b0..c16a11cbd06 100644
--- a/localbroadcastmanager/build.gradle
+++ b/localbroadcastmanager/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
}
androidx {
diff --git a/paging/common/build.gradle b/paging/common/build.gradle
index 2769c96c53a..c643f560cd5 100644
--- a/paging/common/build.gradle
+++ b/paging/common/build.gradle
@@ -31,7 +31,7 @@ lintOptions {
}
dependencies {
- compile("androidx.annotation:annotation:1.1.0-rc01")
+ compile("androidx.annotation:annotation:1.1.0")
compile(ARCH_CORE_COMMON)
compile("androidx.concurrent:concurrent-futures:1.0.0-alpha02")
diff --git a/palette/build.gradle b/palette/build.gradle
index 36ff99757f1..49f73dff173 100644
--- a/palette/build.gradle
+++ b/palette/build.gradle
@@ -16,7 +16,7 @@ android {
dependencies {
api("androidx.core:core:1.1.0-rc01")
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
annotationProcessor(NULLAWAY)
diff --git a/preference/build.gradle b/preference/build.gradle
index a444849e410..893e74878a8 100644
--- a/preference/build.gradle
+++ b/preference/build.gradle
@@ -27,7 +27,7 @@ plugins {
dependencies {
// TODO: change to alpha02 after release
- implementation("androidx.annotation:annotation:1.1.0-rc01")
+ implementation("androidx.annotation:annotation:1.1.0")
api(project(":appcompat"))
// TODO: change to alpha05 after release
api("androidx.core:core:1.1.0-rc01")
diff --git a/print/build.gradle b/print/build.gradle
index 52831c177f8..f738ddeec37 100644
--- a/print/build.gradle
+++ b/print/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
}
androidx {
diff --git a/recommendation/build.gradle b/recommendation/build.gradle
index 60c6210720c..eef72622c76 100644
--- a/recommendation/build.gradle
+++ b/recommendation/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
}
android {
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle
index ac169dd031b..1540b1fd27b 100644
--- a/recyclerview/recyclerview/build.gradle
+++ b/recyclerview/recyclerview/build.gradle
@@ -10,7 +10,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
implementation("androidx.collection:collection:1.0.0")
api("androidx.customview:customview:1.0.0")
diff --git a/recyclerview/selection/build.gradle b/recyclerview/selection/build.gradle
index d26a11e6bcc..66d1d82e3c8 100644
--- a/recyclerview/selection/build.gradle
+++ b/recyclerview/selection/build.gradle
@@ -26,9 +26,9 @@ plugins {
dependencies {
api(project(":recyclerview"))
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
androidTestImplementation(ANDROIDX_TEST_CORE)
diff --git a/remotecallback/build.gradle b/remotecallback/build.gradle
index 169cfffc632..3996700c345 100644
--- a/remotecallback/build.gradle
+++ b/remotecallback/build.gradle
@@ -26,7 +26,7 @@ plugins {
}
dependencies {
- implementation "androidx.annotation:annotation:1.1.0-rc01"
+ implementation "androidx.annotation:annotation:1.1.0"
implementation project(path: ':collection')
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/slices/builders/build.gradle b/slices/builders/build.gradle
index 8329ffe997c..6a7f9c4b6ca 100644
--- a/slices/builders/build.gradle
+++ b/slices/builders/build.gradle
@@ -27,7 +27,7 @@ plugins {
dependencies {
implementation(project(":slice-core"))
api(project(":remotecallback"))
- implementation "androidx.annotation:annotation:1.1.0-rc01"
+ implementation "androidx.annotation:annotation:1.1.0"
implementation "androidx.core:core:1.1.0-rc01"
implementation project(':collection')
}
diff --git a/slices/builders/ktx/build.gradle b/slices/builders/ktx/build.gradle
index a161e74f9a9..768a63ab7a5 100644
--- a/slices/builders/ktx/build.gradle
+++ b/slices/builders/ktx/build.gradle
@@ -39,7 +39,7 @@ android {
dependencies {
implementation(project(":slice-core"))
- implementation "androidx.annotation:annotation:1.1.0-rc01"
+ implementation "androidx.annotation:annotation:1.1.0"
implementation(project(":core:core"))
api(project(":slice-builders"))
api(KOTLIN_STDLIB)
diff --git a/slices/core/build.gradle b/slices/core/build.gradle
index e501d26f748..6c412b25cb4 100644
--- a/slices/core/build.gradle
+++ b/slices/core/build.gradle
@@ -26,9 +26,9 @@ plugins {
}
dependencies {
- implementation "androidx.annotation:annotation:1.1.0-rc01"
+ implementation "androidx.annotation:annotation:1.1.0"
implementation project(":appcompat")
- api "androidx.collection:collection:1.1.0-rc01"
+ api "androidx.collection:collection:1.1.0"
api(project(":remotecallback"))
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/slices/view/build.gradle b/slices/view/build.gradle
index a1344e85a3c..1bef28e4ccb 100644
--- a/slices/view/build.gradle
+++ b/slices/view/build.gradle
@@ -27,7 +27,7 @@ plugins {
dependencies {
implementation(project(":slice-core"))
implementation(project(":recyclerview"))
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
api(ARCH_LIFECYCLE_LIVEDATA_CORE, libs.exclude_annotations_transitive)
androidTestImplementation(project(":slice-builders"))
diff --git a/slidingpanelayout/build.gradle b/slidingpanelayout/build.gradle
index a32f4856af2..bba439bf49a 100644
--- a/slidingpanelayout/build.gradle
+++ b/slidingpanelayout/build.gradle
@@ -8,7 +8,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
api(project(":customview"))
}
diff --git a/swiperefreshlayout/build.gradle b/swiperefreshlayout/build.gradle
index 162dfc16ece..020bf8f46ce 100644
--- a/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
api("androidx.interpolator:interpolator:1.0.0")
diff --git a/textclassifier/build.gradle b/textclassifier/build.gradle
index 9a5cff5e010..dd802d6bf96 100644
--- a/textclassifier/build.gradle
+++ b/textclassifier/build.gradle
@@ -10,7 +10,7 @@ plugins {
dependencies {
api(project(":appcompat"))
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
implementation("androidx.collection:collection:1.0.0")
// TODO: change to 1.1.0-alpha04 after release
api("androidx.core:core:1.1.0-rc01")
diff --git a/transition/build.gradle b/transition/build.gradle
index ad24139d9ca..329d8dc96ac 100644
--- a/transition/build.gradle
+++ b/transition/build.gradle
@@ -10,7 +10,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.0.1")
implementation("androidx.collection:collection:1.0.0")
compileOnly("androidx.fragment:fragment:1.0.0")
diff --git a/tv-provider/build.gradle b/tv-provider/build.gradle
index 35a92dca933..89b16a43f6f 100644
--- a/tv-provider/build.gradle
+++ b/tv-provider/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/versionedparcelable/build.gradle b/versionedparcelable/build.gradle
index d5a60be95e2..0c838831266 100644
--- a/versionedparcelable/build.gradle
+++ b/versionedparcelable/build.gradle
@@ -26,7 +26,7 @@ plugins {
}
dependencies {
- implementation("androidx.annotation:annotation:1.1.0-rc01")
+ implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.collection:collection:1.0.0")
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/viewpager/build.gradle b/viewpager/build.gradle
index 3abbc19ab35..34d439fe8fa 100644
--- a/viewpager/build.gradle
+++ b/viewpager/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
api(project(":customview"))
diff --git a/viewpager2/build.gradle b/viewpager2/build.gradle
index 62d1b10b5f6..d8f48f7fbf6 100644
--- a/viewpager2/build.gradle
+++ b/viewpager2/build.gradle
@@ -28,7 +28,7 @@ plugins {
dependencies {
api(project(":fragment"))
api(project(":recyclerview"))
- implementation("androidx.collection:collection:1.1.0-rc01")
+ implementation("androidx.collection:collection:1.1.0")
androidTestImplementation(project(":appcompat"))
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/wear/build.gradle b/wear/build.gradle
index 5924e5f90ee..369dfc9f6fc 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -9,7 +9,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api(project(":swiperefreshlayout"))
api(project(":fragment"))
api(project(":recyclerview"))
diff --git a/webkit/build.gradle b/webkit/build.gradle
index b0d14ae1962..8c0c18d65fb 100644
--- a/webkit/build.gradle
+++ b/webkit/build.gradle
@@ -25,7 +25,7 @@ plugins {
}
dependencies {
- api("androidx.annotation:annotation:1.1.0-rc01")
+ api("androidx.annotation:annotation:1.1.0")
api("androidx.core:core:1.1.0-rc01")
androidTestImplementation(OKHTTP_MOCKWEBSERVER)