Permalink
Browse files

Update to gradle 3.0 style dependencies.

Use api, androidTestImplementation, and testImplementation
when specifying project dependencies.

Test: ./gradlew assemble
Change-Id: I014e51be73f3f7c086c5739c4bdbd27145a834bc
  • Loading branch information...
Aurimas Liutikas
Aurimas Liutikas committed Jul 5, 2017
1 parent beff801 commit 1989c3cc10abd7e7943ef327a95c507b05158161
Showing with 211 additions and 208 deletions.
  1. +6 −6 compat/build.gradle
  2. +7 −7 core-ui/build.gradle
  3. +6 −6 core-utils/build.gradle
  4. +5 −7 customtabs/build.gradle
  5. +13 −13 design/build.gradle
  6. +5 −5 dynamic-animation/build.gradle
  7. +7 −7 emoji/appcompat/build.gradle
  8. +1 −1 emoji/bundled/build.gradle
  9. +7 −7 emoji/core/build.gradle
  10. +2 −2 exifinterface/build.gradle
  11. +7 −7 fragment/build.gradle
  12. +5 −4 graphics/drawable/animated/build.gradle
  13. +4 −3 graphics/drawable/static/build.gradle
  14. +7 −7 media-compat/build.gradle
  15. +4 −3 percent/build.gradle
  16. +1 −1 recommendation/build.gradle
  17. +1 −1 samples/Support13Demos/build.gradle
  18. +1 −1 samples/Support4Demos/build.gradle
  19. +6 −6 samples/Support7Demos/build.gradle
  20. +1 −1 samples/SupportAnimationDemos/build.gradle
  21. +1 −1 samples/SupportAppNavigation/build.gradle
  22. +1 −1 samples/SupportDesignDemos/build.gradle
  23. +3 −3 samples/SupportEmojiDemos/build.gradle
  24. +2 −2 samples/SupportLeanbackDemos/build.gradle
  25. +3 −3 samples/SupportLeanbackJank/build.gradle
  26. +1 −1 samples/SupportPercentDemos/build.gradle
  27. +6 −6 samples/SupportPreferenceDemos/build.gradle
  28. +2 −2 samples/SupportTransitionDemos/build.gradle
  29. +3 −3 samples/SupportVectorDrawableDemos/build.gradle
  30. +1 −1 samples/SupportWearDemos/build.gradle
  31. +6 −6 transition/build.gradle
  32. +4 −3 tv-provider/build.gradle
  33. +6 −6 v13/build.gradle
  34. +4 −4 v14/preference/build.gradle
  35. +10 −10 v17/leanback/build.gradle
  36. +6 −6 v17/preference-leanback/build.gradle
  37. +5 −5 v4/build.gradle
  38. +9 −9 v7/appcompat/build.gradle
  39. +1 −1 v7/cardview/build.gradle
  40. +4 −4 v7/gridlayout/build.gradle
  41. +5 −5 v7/mediarouter/build.gradle
  42. +3 −3 v7/palette/build.gradle
  43. +7 −7 v7/preference/build.gradle
  44. +13 −13 v7/recyclerview/build.gradle
  45. +9 −8 wear/build.gradle
@@ -1,17 +1,17 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-annotations')
api project(':support-annotations')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestCompile project(':support-testutils')
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
androidTestImplementation project(':support-testutils')
}
android {
@@ -1,18 +1,18 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-annotations')
compile project(':support-compat')
api project(':support-annotations')
api project(':support-compat')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestCompile project(':support-testutils')
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
androidTestImplementation project(':support-testutils')
}
android {
@@ -1,17 +1,17 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-annotations')
compile project(':support-compat')
api project(':support-annotations')
api project(':support-compat')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
}
android {
@@ -1,18 +1,16 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-compat')
compile project(':support-annotations')
api project(':support-compat')
api project(':support-annotations')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile project(':support-testutils')
androidTestImplementation project(':support-testutils')
}
android {
@@ -1,27 +1,27 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-v4')
compile project(':support-appcompat-v7')
compile project(':support-recyclerview-v7')
compile project(':support-transition')
api project(':support-v4')
api project(':support-appcompat-v7')
api project(':support-recyclerview-v7')
api project(':support-transition')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_contrib) {
androidTestImplementation (libs.espresso_contrib) {
exclude group: 'com.android.support'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestCompile project(':support-testutils')
androidTestCompile libs.multidex
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
androidTestImplementation project(':support-testutils')
androidTestImplementation libs.multidex
testCompile libs.junit
testCompile ("$libs.test_runner") {
testImplementation libs.junit
testImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
}
@@ -1,16 +1,16 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-core-utils')
api project(':support-core-utils')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
}
android {
@@ -17,18 +17,18 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile project(':support-emoji')
compile project(':support-appcompat-v7')
api fileTree(include: ['*.jar'], dir: 'libs')
api project(':support-emoji')
api project(':support-appcompat-v7')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
}
android {
@@ -18,7 +18,7 @@ android {
}
dependencies {
compile project(path: ':support-emoji')
api project(':support-emoji')
}
supportLibrary {
@@ -6,18 +6,18 @@ ext {
evaluationDependsOn(':noto-emoji-compat')
dependencies {
compile project(':support-compat')
compile files(project(':noto-emoji-compat').configurations.parser.artifacts.getFiles())
api project(':support-compat')
api files(project(':noto-emoji-compat').configurations.parser.artifacts.getFiles())
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestCompile project(':support-testutils')
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
androidTestImplementation project(':support-testutils')
}
android {
@@ -1,9 +1,9 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-annotations')
api project(':support-annotations')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
}
@@ -1,18 +1,18 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-compat')
compile project(':support-core-ui')
compile project(':support-core-utils')
api project(':support-compat')
api project(':support-core-ui')
api project(':support-core-utils')
androidTestCompile (libs.test_runner) {
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
}
android {
@@ -1,14 +1,15 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-vector-drawable')
androidTestCompile (libs.test_runner) {
api project(':support-vector-drawable')
api project(':support-core-ui')
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
compile project(path: ':support-core-ui')
}
android {
@@ -1,9 +1,10 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-annotations')
compile project(':support-compat')
androidTestCompile (libs.test_runner) {
api project(':support-annotations')
api project(':support-compat')
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
}
@@ -1,18 +1,18 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-annotations')
compile project(':support-compat')
api project(':support-annotations')
api project(':support-compat')
androidTestCompile(libs.test_runner) {
androidTestImplementation(libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile(libs.espresso_core) {
androidTestImplementation(libs.espresso_core) {
exclude module: 'support-annotations'
}
androidTestCompile libs.mockito_core
androidTestCompile libs.dexmaker_mockito
androidTestCompile project(':support-testutils')
androidTestImplementation libs.mockito_core
androidTestImplementation libs.dexmaker_mockito
androidTestImplementation project(':support-testutils')
}
android {
@@ -1,11 +1,12 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-compat')
androidTestCompile (libs.test_runner) {
api project(':support-compat')
androidTestImplementation (libs.test_runner) {
exclude module: 'support-annotations'
}
androidTestCompile (libs.espresso_core) {
androidTestImplementation (libs.espresso_core) {
exclude module: 'support-annotations'
}
}
@@ -1,7 +1,7 @@
apply plugin: android.support.SupportLibraryPlugin
dependencies {
compile project(':support-v4')
api project(':support-v4')
}
android {
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
compile project(':support-v13')
implementation project(':support-v13')
}
android {
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
compile project(':support-v4')
implementation project(':support-v4')
}
android {
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
dependencies {
compile project(':support-appcompat-v7')
compile project(':support-cardview-v7')
compile project(':support-gridlayout-v7')
compile project(':support-mediarouter-v7')
compile project(':support-palette-v7')
compile project(':support-recyclerview-v7')
implementation project(':support-appcompat-v7')
implementation project(':support-cardview-v7')
implementation project(':support-gridlayout-v7')
implementation project(':support-mediarouter-v7')
implementation project(':support-palette-v7')
implementation project(':support-recyclerview-v7')
}
android {
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
compile project(':support-dynamic-animation')
implementation project(':support-dynamic-animation')
}
android {
@@ -17,7 +17,7 @@
apply plugin: 'com.android.application'
dependencies {
compile project(':support-v4')
implementation project(':support-v4')
}
android {
Oops, something went wrong.

0 comments on commit 1989c3c

Please sign in to comment.