diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-07-11 15:33:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-11 15:33:15 +0000 |
| commit | 261e88ef1bd892e3c61281da434b03ee3d9706e3 (patch) | |
| tree | ebf227805556b2ffa019bed00ba5c4fbd0724452 | |
| parent | ba8fee0adaa958f2d6a98b6c9f1b702846a3241e (diff) | |
| parent | 79753fb09cf7cc3fc1f386fdbc1fe00fb136bf60 (diff) | |
| download | support-261e88ef1bd892e3c61281da434b03ee3d9706e3.tar.gz | |
Merge changes I0c09501a,I5c87748b,Ie2311878,I4f6dce0a,I8d405815 into androidx-master-dev
* changes:
Migrate core to implementation dependencies
Migrate core to implementation dependencies
Migrate core to implementation dependencies
Migrate core and livedata to implementation dependencies
Minimize dependencies and reduce their visibility
| -rw-r--r-- | gridlayout/build.gradle | 3 | ||||
| -rw-r--r-- | loader/loader-ktx/build.gradle | 1 | ||||
| -rw-r--r-- | loader/loader/build.gradle | 4 | ||||
| -rw-r--r-- | navigation/navigation-common/build.gradle | 3 | ||||
| -rw-r--r-- | percentlayout/percentlayout/build.gradle | 3 | ||||
| -rw-r--r-- | security/crypto/build.gradle | 6 |
6 files changed, 11 insertions, 9 deletions
diff --git a/gridlayout/build.gradle b/gridlayout/build.gradle index 79b383994bb..efb73753ca7 100644 --- a/gridlayout/build.gradle +++ b/gridlayout/build.gradle @@ -9,7 +9,8 @@ plugins { } dependencies { - api("androidx.core:core:1.1.0-rc01") + api(ANDROIDX_ANNOTATION) + implementation("androidx.core:core:1.1.0-rc01") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) diff --git a/loader/loader-ktx/build.gradle b/loader/loader-ktx/build.gradle index 7e007b973f2..5098ca6db14 100644 --- a/loader/loader-ktx/build.gradle +++ b/loader/loader-ktx/build.gradle @@ -41,6 +41,7 @@ dependencies { api(KOTLIN_STDLIB) androidTestImplementation(TRUTH) + androidTestImplementation(ARCH_LIFECYCLE_RUNTIME) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) androidTestImplementation(ANDROIDX_TEST_RUNNER) diff --git a/loader/loader/build.gradle b/loader/loader/build.gradle index a83f99326da..ff3e35c69a7 100644 --- a/loader/loader/build.gradle +++ b/loader/loader/build.gradle @@ -17,9 +17,9 @@ android { dependencies { api("androidx.annotation:annotation:1.0.0") - api("androidx.core:core:1.0.0") + implementation("androidx.core:core:1.0.0") implementation("androidx.collection:collection:1.0.0") - api(ARCH_LIFECYCLE_LIVEDATA_CORE, libs.exclude_annotations_transitive) + implementation(ARCH_LIFECYCLE_LIVEDATA_CORE, libs.exclude_annotations_transitive) api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive) androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) diff --git a/navigation/navigation-common/build.gradle b/navigation/navigation-common/build.gradle index 549a71f1052..037580a11ca 100644 --- a/navigation/navigation-common/build.gradle +++ b/navigation/navigation-common/build.gradle @@ -27,7 +27,8 @@ plugins { } dependencies { - api("androidx.core:core:1.0.1") + api(ANDROIDX_ANNOTATION) + implementation("androidx.core:core:1.0.1") implementation(ANDROIDX_COLLECTION) testImplementation(JUNIT) diff --git a/percentlayout/percentlayout/build.gradle b/percentlayout/percentlayout/build.gradle index 61bf71b85a8..5b2ac053b1c 100644 --- a/percentlayout/percentlayout/build.gradle +++ b/percentlayout/percentlayout/build.gradle @@ -9,7 +9,8 @@ plugins { } dependencies { - api("androidx.core:core:1.1.0-rc01") + api(ANDROIDX_ANNOTATION) + implementation("androidx.core:core:1.1.0-rc01") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) androidTestImplementation(ANDROIDX_TEST_CORE) diff --git a/security/crypto/build.gradle b/security/crypto/build.gradle index a6e7c217266..36bdcbacaa9 100644 --- a/security/crypto/build.gradle +++ b/security/crypto/build.gradle @@ -26,11 +26,9 @@ plugins { } dependencies { - api("androidx.annotation:annotation:1.0.0") { transitive = true} - api("androidx.core:core:1.0.0") { transitive = true} - api("androidx.fragment:fragment:1.0.0") { transitive = true} + api("androidx.annotation:annotation:1.0.0") - api("com.google.crypto.tink:tink-android:1.2.2") + implementation("com.google.crypto.tink:tink-android:1.2.2") androidTestImplementation("androidx.test.ext:junit:1.1.0") androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT) |