aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-04-23 22:59:36 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-04-23 22:59:36 +0000
commit7d177d24f9afd2a59ee18763d2b65ea3fd092238 (patch)
treedbacd77295d94dac2d57b4ecc26c63d6be8617a4
parentcd192eef4ea490bdf70240f572ed10312925342d (diff)
parent071278b0621959f00f2e93716f3f47bc2a52fc53 (diff)
downloadsupport-snap-temp-L03000000548026755.tar.gz
Merge "Merge cherrypicks of [1294540] into androidx-sharetarget-release" into androidx-sharetarget-releasesnap-temp-L71800000674277563snap-temp-L16200000674721559snap-temp-L03000000548026755
-rw-r--r--sharetarget/build.gradle2
-rw-r--r--sharetarget/integration-tests/testapp/build.gradle2
2 files changed, 2 insertions, 2 deletions
diff --git a/sharetarget/build.gradle b/sharetarget/build.gradle
index 556602d16d7..73bb33d7197 100644
--- a/sharetarget/build.gradle
+++ b/sharetarget/build.gradle
@@ -25,7 +25,7 @@ plugins {
}
dependencies {
- api("androidx.core:core:1.2.0-rc01")
+ api("androidx.core:core:1.2.0")
api("androidx.collection:collection:1.0.0")
api(GUAVA_LISTENABLE_FUTURE)
implementation("androidx.concurrent:concurrent-futures:1.0.0")
diff --git a/sharetarget/integration-tests/testapp/build.gradle b/sharetarget/integration-tests/testapp/build.gradle
index 83ec6d9a5e2..0853bb818dc 100644
--- a/sharetarget/integration-tests/testapp/build.gradle
+++ b/sharetarget/integration-tests/testapp/build.gradle
@@ -22,7 +22,7 @@ plugins {
}
dependencies {
- api("androidx.core:core:1.2.0-rc01")
+ api("androidx.core:core:1.2.0")
api(project(":sharetarget"))
api("androidx.appcompat:appcompat:1.1.0")
api(CONSTRAINT_LAYOUT, { transitive = true })