Make build.gradle files even more kotlin script friendly.
Test: ./gradlew tasks
Change-Id: Ia6f61f61fef1733e990b95cdfde26a95d9091ab5
diff --git a/app-toolkit/common/build.gradle b/app-toolkit/common/build.gradle
index d5583d9..bd10317 100644
--- a/app-toolkit/common/build.gradle
+++ b/app-toolkit/common/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension;
@@ -25,8 +26,8 @@
dependencies {
compile libs.support.annotations
- testCompile libs.junit
- testCompile libs.mockito_core
+ testCompile(JUNIT)
+ testCompile(MOCKITO_CORE)
}
supportLibrary {
diff --git a/app-toolkit/core-testing/build.gradle b/app-toolkit/core-testing/build.gradle
index cf2d6c7..3ee9584 100644
--- a/app-toolkit/core-testing/build.gradle
+++ b/app-toolkit/core-testing/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -29,17 +30,17 @@
}
dependencies {
- api project(":arch:runtime")
+ api(project(":arch:runtime"))
api libs.support.annotations
- api libs.junit
- api libs.mockito_core, { exclude group: 'net.bytebuddy' }
+ api(JUNIT)
+ api(MOCKITO_CORE, libs.exclude_bytebuddy)
- testImplementation libs.junit
+ testImplementation(JUNIT)
testImplementation libs.support.annotations
- androidTestImplementation libs.junit
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
+ androidTestImplementation(JUNIT)
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
}
supportLibrary {
diff --git a/app-toolkit/runtime/build.gradle b/app-toolkit/runtime/build.gradle
index 8d2c370..83d4293 100644
--- a/app-toolkit/runtime/build.gradle
+++ b/app-toolkit/runtime/build.gradle
@@ -30,7 +30,7 @@
dependencies {
api libs.support.annotations
- api project(":arch:common")
+ api(project(":arch:common"))
}
supportLibrary {
diff --git a/buildSrc/dependencies.gradle b/buildSrc/dependencies.gradle
index b61cfc6..470551b 100644
--- a/buildSrc/dependencies.gradle
+++ b/buildSrc/dependencies.gradle
@@ -16,14 +16,17 @@
// Add ext.libs for library versions
def libs = [:]
-// Testing dependencies
-libs.mockito_core = 'org.mockito:mockito-core:2.7.6'
-libs.dexmaker_mockito = 'com.linkedin.dexmaker:dexmaker-mockito:2.2.0'
-libs.junit = 'junit:junit:4.12'
-libs.test_runner = 'com.android.support.test:runner:1.0.1'
-libs.test_rules = 'com.android.support.test:rules:1.0.1'
-libs.espresso_core = 'com.android.support.test.espresso:espresso-core:3.0.1'
-libs.espresso_contrib = 'com.android.support.test.espresso:espresso-contrib:3.0.1'
+libs.exclude_annotations = {
+ exclude module: 'support-annotations'
+}
+
+libs.exclude_bytebuddy = {
+ exclude group: 'net.bytebuddy'
+}
+
+libs.exclude_support = {
+ exclude group: 'com.android.support'
+}
//arch components
libs.arch_lifecycle_runtime = "android.arch.lifecycle:runtime:1.0.3@aar"
diff --git a/buildSrc/src/main/kotlin/android/support/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/android/support/dependencies/Dependencies.kt
new file mode 100644
index 0000000..6748b50
--- /dev/null
+++ b/buildSrc/src/main/kotlin/android/support/dependencies/Dependencies.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.support.dependencies
+
+const val MOCKITO_CORE = "org.mockito:mockito-core:2.7.6"
+const val DEXMAKER_MOCKITO = "com.linkedin.dexmaker:dexmaker-mockito:2.2.0"
+const val JUNIT = "junit:junit:4.12"
+const val TEST_RUNNER = "com.android.support.test:runner:1.0.1"
+const val TEST_RULES = "com.android.support.test:rules:1.0.1"
+const val ESPRESSO_CORE = "com.android.support.test.espresso:espresso-core:3.0.1"
+const val ESPRESSO_CONTRIB = "com.android.support.test.espresso:espresso-contrib:3.0.1"
\ No newline at end of file
diff --git a/car/build.gradle b/car/build.gradle
index c1be3a3..487f2bc 100644
--- a/car/build.gradle
+++ b/car/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
plugins {
@@ -11,11 +12,11 @@
api project(':support-v4')
api project(':recyclerview-v7')
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_contrib, { exclude group: 'com.android.support' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
android {
diff --git a/compat/build.gradle b/compat/build.gradle
index b8ea13b..b3fa298 100644
--- a/compat/build.gradle
+++ b/compat/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,16 +7,16 @@
}
dependencies {
- api project(':support-annotations')
+ api(project(":support-annotations"))
api (libs.arch_lifecycle_runtime) {
exclude module: 'support-annotations'
transitive = true
}
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':support-testutils'), {
exclude group: 'com.android.support', module: 'support-compat'
}
diff --git a/content/build.gradle b/content/build.gradle
index 3639301..15f96c4 100644
--- a/content/build.gradle
+++ b/content/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -22,12 +23,12 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-compat')
+ api(project(":support-annotations"))
+ api(project(":support-compat"))
- androidTestImplementation libs.junit
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
+ androidTestImplementation(JUNIT)
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
}
android {
diff --git a/core-ui/build.gradle b/core-ui/build.gradle
index 098440d..8bab1cb 100644
--- a/core-ui/build.gradle
+++ b/core-ui/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,20 +7,19 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-compat')
+ api(project(":support-annotations"))
+ api(project(":support-compat"))
api project(':support-core-utils')
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_contrib, { exclude group: 'com.android.support' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':support-testutils'), {
exclude group: 'com.android.support', module: 'support-core-ui'
}
- testImplementation libs.junit
+ testImplementation(JUNIT)
}
android {
diff --git a/core-utils/build.gradle b/core-utils/build.gradle
index 64c9ff8..de4f67c 100644
--- a/core-utils/build.gradle
+++ b/core-utils/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,13 +7,13 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-compat')
+ api(project(":support-annotations"))
+ api(project(":support-compat"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
android {
diff --git a/customtabs/build.gradle b/customtabs/build.gradle
index 28b5f99..abcca93 100644
--- a/customtabs/build.gradle
+++ b/customtabs/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,21 +7,21 @@
}
dependencies {
- api project(':support-compat')
- api project(':support-annotations')
+ api(project(":support-compat"))
+ api(project(":support-annotations"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation project(':support-testutils')
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(project(":support-testutils"))
}
android {
defaultConfig {
- minSdkVersion 15
+ minSdkVersion(15)
}
sourceSets {
- main.aidl.srcDirs = ['src/main/java']
+ main.aidl.srcDirs = ["src/main/java"]
}
}
diff --git a/design/build.gradle b/design/build.gradle
index 06a5a55..804ed16 100644
--- a/design/build.gradle
+++ b/design/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,16 +7,16 @@
}
dependencies {
- api project(':support-v4')
- api project(':appcompat-v7')
- api project(':recyclerview-v7')
- api project(':transition')
+ api(project(":support-v4"))
+ api(project(":appcompat-v7"))
+ api(project(":recyclerview-v7"))
+ api(project(":transition"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_contrib, { exclude group: 'com.android.support' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':support-testutils')
}
diff --git a/dynamic-animation/build.gradle b/dynamic-animation/build.gradle
index 5069a73..21dbfb3 100644
--- a/dynamic-animation/build.gradle
+++ b/dynamic-animation/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,12 +7,12 @@
}
dependencies {
- api project(':support-core-utils')
+ api(project(":support-core-utils"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
android {
diff --git a/emoji/appcompat/build.gradle b/emoji/appcompat/build.gradle
index 7912c52..3fe04d8 100644
--- a/emoji/appcompat/build.gradle
+++ b/emoji/appcompat/build.gradle
@@ -23,8 +23,8 @@
dependencies {
api fileTree(include: ['*.jar'], dir: 'libs')
- api project(':support-emoji')
- api project(':appcompat-v7')
+ api(project(":support-emoji"))
+ api(project(":appcompat-v7"))
}
android {
diff --git a/emoji/bundled/build.gradle b/emoji/bundled/build.gradle
index c0613f22..013ab85 100644
--- a/emoji/bundled/build.gradle
+++ b/emoji/bundled/build.gradle
@@ -20,7 +20,7 @@
}
dependencies {
- api project(':support-emoji')
+ api(project(":support-emoji"))
}
supportLibrary {
diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index f07c277..67d7530 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -19,12 +20,12 @@
// treats this as local jar and package it inside the aar.
api files(configurations.repackage)
- api project(':support-compat')
+ api(project(":support-compat"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':support-testutils')
}
diff --git a/exifinterface/build.gradle b/exifinterface/build.gradle
index b7218f9..f5e63f6 100644
--- a/exifinterface/build.gradle
+++ b/exifinterface/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,9 +7,9 @@
}
dependencies {
- api project(':support-annotations')
+ api(project(":support-annotations"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
}
android {
diff --git a/fragment/build.gradle b/fragment/build.gradle
index 73977c2..720a68e 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,15 +7,15 @@
}
dependencies {
- api project(':support-compat')
- api project(':support-core-ui')
- api project(':support-core-utils')
- api project(':support-annotations')
+ api(project(":support-compat"))
+ api(project(":support-core-ui"))
+ api(project(":support-core-utils"))
+ api(project(":support-annotations"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has its own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has its own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':support-testutils'), {
exclude group: 'com.android.support', module: 'support-fragment'
}
diff --git a/graphics/drawable/animated/build.gradle b/graphics/drawable/animated/build.gradle
index bfe405f..ffa850f 100644
--- a/graphics/drawable/animated/build.gradle
+++ b/graphics/drawable/animated/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,26 +7,26 @@
}
dependencies {
- api project(':support-vector-drawable')
- api project(':support-core-ui')
+ api(project(":support-vector-drawable"))
+ api(project(":support-core-ui"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
}
android {
defaultConfig {
- minSdkVersion 14
+ minSdkVersion(14)
// This disables the builds tools automatic vector -> PNG generation
generatedDensities = []
}
aaptOptions {
- additionalParameters "--no-version-vectors"
+ additionalParameters("--no-version-vectors")
}
buildTypes.all {
- consumerProguardFiles 'proguard-rules.pro'
+ consumerProguardFiles("proguard-rules.pro")
}
}
diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index b8ab699..8e498fe 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,10 +7,10 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-compat')
+ api(project(":support-annotations"))
+ api(project(":support-compat"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
}
android {
diff --git a/leanback/build.gradle b/leanback/build.gradle
index 4ebec71..c07bc76 100644
--- a/leanback/build.gradle
+++ b/leanback/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,16 +7,16 @@
}
dependencies {
- api project(':support-compat')
- api project(':support-core-ui')
- api project(':support-media-compat')
- api project(':support-fragment')
- api project(':recyclerview-v7')
+ api(project(":support-compat"))
+ api(project(":support-core-ui"))
+ api(project(":support-media-compat"))
+ api(project(":support-fragment"))
+ api(project(":recyclerview-v7"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
android {
diff --git a/lifecycle/common-java8/build.gradle b/lifecycle/common-java8/build.gradle
index e96e7ae..137ea32c 100644
--- a/lifecycle/common-java8/build.gradle
+++ b/lifecycle/common-java8/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions;
import android.support.SupportLibraryExtension;
@@ -23,9 +24,9 @@
}
dependencies {
- testCompile libs.junit
- testCompile libs.mockito_core
- compile project(":lifecycle:common")
+ testCompile(JUNIT)
+ testCompile(MOCKITO_CORE)
+ compile(project(":lifecycle:common"))
compile libs.support.annotations
}
diff --git a/lifecycle/common/build.gradle b/lifecycle/common/build.gradle
index 33d8235..bc46d17 100644
--- a/lifecycle/common/build.gradle
+++ b/lifecycle/common/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions;
import android.support.SupportLibraryExtension;
@@ -23,8 +24,8 @@
}
dependencies {
- testCompile libs.junit
- testCompile libs.mockito_core
+ testCompile(JUNIT)
+ testCompile(MOCKITO_CORE)
compile libs.support.annotations
}
diff --git a/lifecycle/compiler/build.gradle b/lifecycle/compiler/build.gradle
index 6d6fd66..cbed742 100644
--- a/lifecycle/compiler/build.gradle
+++ b/lifecycle/compiler/build.gradle
@@ -15,7 +15,7 @@
}
dependencies {
- compile project(":lifecycle:common")
+ compile(project(":lifecycle:common"))
compile libs.kotlin.stdlib
compile libs.auto_common
compile libs.javapoet
diff --git a/lifecycle/extensions/build.gradle b/lifecycle/extensions/build.gradle
index f74fd40..b7166ea 100644
--- a/lifecycle/extensions/build.gradle
+++ b/lifecycle/extensions/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -33,18 +34,18 @@
}
dependencies {
- api project(":lifecycle:runtime")
- api project(":arch:common")
- api project(":arch:runtime")
+ api(project(":lifecycle:runtime"))
+ api(project(":arch:common"))
+ api(project(":arch:runtime"))
api libs.support.fragments, libs.support_exclude_config
- api project(":lifecycle:common")
+ api(project(":lifecycle:common"))
- testImplementation project(":arch:core-testing")
- testImplementation libs.junit
- testImplementation libs.mockito_core
+ testImplementation(project(":arch:core-testing"))
+ testImplementation(JUNIT)
+ testImplementation(MOCKITO_CORE)
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
androidTestImplementation libs.support.app_compat, libs.support_exclude_config
}
diff --git a/lifecycle/integration-tests/testapp/build.gradle b/lifecycle/integration-tests/testapp/build.gradle
index d733c32..c640eeb 100644
--- a/lifecycle/integration-tests/testapp/build.gradle
+++ b/lifecycle/integration-tests/testapp/build.gradle
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
+
apply plugin: 'com.android.application'
project.ext.noDocs = true
@@ -60,22 +62,18 @@
dependencies {
// IJ canont figure out transitive dependencies so need to declare them.
- implementation project(":lifecycle:common")
- implementation project(":lifecycle:runtime")
- implementation project(":lifecycle:extensions")
- annotationProcessor project(":lifecycle:compiler")
+ implementation(project(":lifecycle:common"))
+ implementation(project(":lifecycle:runtime"))
+ implementation(project(":lifecycle:extensions"))
+ annotationProcessor(project(":lifecycle:compiler"))
- androidTestAnnotationProcessor project(":lifecycle:compiler")
- androidTestImplementation(libs.test_runner) {
- exclude module: 'support-annotations'
- }
- androidTestImplementation(libs.espresso_core, {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
+ androidTestAnnotationProcessor(project(":lifecycle:compiler"))
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
- testImplementation libs.junit
- testImplementation libs.mockito_core
- testAnnotationProcessor project(":lifecycle:compiler")
+ testImplementation(JUNIT)
+ testImplementation(MOCKITO_CORE)
+ testAnnotationProcessor(project(":lifecycle:compiler"))
}
tasks['check'].dependsOn(tasks['connectedCheck'])
diff --git a/lifecycle/reactivestreams/build.gradle b/lifecycle/reactivestreams/build.gradle
index 6d77bb7..af7b430 100644
--- a/lifecycle/reactivestreams/build.gradle
+++ b/lifecycle/reactivestreams/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -30,19 +31,17 @@
allprojects {
dependencies {
- api project(":arch:common")
- api project(":lifecycle:common")
- api project(":lifecycle:extensions")
- api project(":lifecycle:runtime")
+ api(project(":arch:common"))
+ api(project(":lifecycle:common"))
+ api(project(":lifecycle:extensions"))
+ api(project(":lifecycle:runtime"))
api libs.support.annotations
api libs.reactive_streams
- testImplementation libs.junit
+ testImplementation(JUNIT)
testImplementation libs.rx_java
+ testImplementation(TEST_RUNNER, libs.exclude_annotations)
- testImplementation(libs.test_runner) {
- exclude module: 'support-annotations'
- }
androidTestImplementation libs.support.app_compat, libs.support_exclude_config
}
}
diff --git a/lifecycle/runtime/build.gradle b/lifecycle/runtime/build.gradle
index cf0e4d3..96f9a6f 100644
--- a/lifecycle/runtime/build.gradle
+++ b/lifecycle/runtime/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -17,16 +18,16 @@
}
dependencies {
- api project(":lifecycle:common")
- api project(":arch:common")
+ api(project(":lifecycle:common"))
+ api(project(":arch:common"))
// necessary for IJ to resolve dependencies.
api libs.support.annotations
- testImplementation libs.junit
- testImplementation libs.mockito_core
+ testImplementation(JUNIT)
+ testImplementation(MOCKITO_CORE)
- androidTestImplementation libs.junit
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
+ androidTestImplementation(JUNIT)
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
}
supportLibrary {
diff --git a/media-compat/build.gradle b/media-compat/build.gradle
index ec4504e..b832de6 100644
--- a/media-compat/build.gradle
+++ b/media-compat/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,13 +7,13 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-compat')
+ api(project(":support-annotations"))
+ api(project(":support-compat"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':support-testutils')
}
diff --git a/media-compat/version-compat-tests/current/client/build.gradle b/media-compat/version-compat-tests/current/client/build.gradle
index d6f0e7d..24e46d4 100644
--- a/media-compat/version-compat-tests/current/client/build.gradle
+++ b/media-compat/version-compat-tests/current/client/build.gradle
@@ -14,15 +14,17 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
+
plugins {
id("SupportAndroidLibraryPlugin")
}
dependencies {
- androidTestImplementation project(':support-media-compat')
- androidTestImplementation project(':support-media-compat-test-lib')
+ androidTestImplementation(project(":support-media-compat"))
+ androidTestImplementation(project(":support-media-compat-test-lib"))
- androidTestImplementation(libs.test_runner)
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
}
android {
diff --git a/media-compat/version-compat-tests/current/service/build.gradle b/media-compat/version-compat-tests/current/service/build.gradle
index 2cfa5ce..1318d33 100644
--- a/media-compat/version-compat-tests/current/service/build.gradle
+++ b/media-compat/version-compat-tests/current/service/build.gradle
@@ -14,15 +14,17 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
+
plugins {
id("SupportAndroidLibraryPlugin")
}
dependencies {
- androidTestImplementation project(':support-media-compat')
- androidTestImplementation project(':support-media-compat-test-lib')
+ androidTestImplementation(project(":support-media-compat"))
+ androidTestImplementation(project(":support-media-compat-test-lib"))
- androidTestImplementation(libs.test_runner)
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
}
android {
diff --git a/media-compat/version-compat-tests/previous/client/build.gradle b/media-compat/version-compat-tests/previous/client/build.gradle
index 01b3847..2788a1a 100644
--- a/media-compat/version-compat-tests/previous/client/build.gradle
+++ b/media-compat/version-compat-tests/previous/client/build.gradle
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
+
plugins {
id("SupportAndroidLibraryPlugin")
}
@@ -22,7 +24,7 @@
androidTestImplementation project(':support-media-compat-test-lib')
androidTestImplementation "com.android.support:support-media-compat:27.0.1"
- androidTestImplementation(libs.test_runner)
+ androidTestImplementation(TEST_RUNNER)
}
android {
diff --git a/media-compat/version-compat-tests/previous/service/build.gradle b/media-compat/version-compat-tests/previous/service/build.gradle
index 03f95ce..469f6e4 100644
--- a/media-compat/version-compat-tests/previous/service/build.gradle
+++ b/media-compat/version-compat-tests/previous/service/build.gradle
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
+
plugins {
id("SupportAndroidLibraryPlugin")
}
@@ -22,7 +24,7 @@
androidTestImplementation project(':support-media-compat-test-lib')
androidTestImplementation "com.android.support:support-media-compat:27.0.1"
- androidTestImplementation(libs.test_runner)
+ androidTestImplementation(TEST_RUNNER)
}
android {
diff --git a/paging/common/build.gradle b/paging/common/build.gradle
index 6bebc5e..c4f949b 100644
--- a/paging/common/build.gradle
+++ b/paging/common/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension;
@@ -25,12 +26,11 @@
dependencies {
compile libs.support.annotations
- compile project(":arch:common")
+ compile(project(":arch:common"))
- testCompile libs.junit
- testCompile libs.mockito_core
- compile libs.support.annotations
- compile project(path: ':arch:common')
+ testCompile(JUNIT)
+ testCompile(MOCKITO_CORE)
+
testCompile libs.kotlin.stdlib
}
diff --git a/paging/integration-tests/testapp/build.gradle b/paging/integration-tests/testapp/build.gradle
index 76ef98b..91312a3 100644
--- a/paging/integration-tests/testapp/build.gradle
+++ b/paging/integration-tests/testapp/build.gradle
@@ -45,13 +45,13 @@
}
dependencies {
- implementation project(':arch:runtime')
- implementation project(':arch:common')
- implementation project(':paging:common')
- implementation project(':lifecycle:extensions')
- implementation project(':lifecycle:runtime')
- implementation project(':lifecycle:common')
- implementation project(':paging:runtime')
+ implementation(project(":arch:runtime"))
+ implementation(project(":arch:common"))
+ implementation(project(":paging:common"))
+ implementation(project(":lifecycle:extensions"))
+ implementation(project(":lifecycle:runtime"))
+ implementation(project(":lifecycle:common"))
+ implementation(project(":paging:runtime"))
implementation 'com.android.support:multidex:1.0.1'
implementation libs.support.recyclerview, libs.support_exclude_config
diff --git a/paging/runtime/build.gradle b/paging/runtime/build.gradle
index ce2d722..e075c6b 100644
--- a/paging/runtime/build.gradle
+++ b/paging/runtime/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -30,18 +31,18 @@
}
dependencies {
- api project(":arch:runtime")
- api project(":paging:common")
- api project(":lifecycle:runtime")
- api project(':lifecycle:extensions')
+ api(project(":arch:runtime"))
+ api(project(":paging:common"))
+ api(project(":lifecycle:runtime"))
+ api(project(":lifecycle:extensions"))
api libs.support.recyclerview, libs.support_exclude_config
- androidTestImplementation libs.junit
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
+ androidTestImplementation(JUNIT)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
androidTestImplementation libs.kotlin.stdlib
}
diff --git a/percent/build.gradle b/percent/build.gradle
index ccee3d2..da5ccc9 100644
--- a/percent/build.gradle
+++ b/percent/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,10 +7,10 @@
}
dependencies {
- api project(':support-compat')
+ api(project(":support-compat"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
}
android {
diff --git a/persistence/db-framework/build.gradle b/persistence/db-framework/build.gradle
index 3ef00c1..6ce2b94 100644
--- a/persistence/db-framework/build.gradle
+++ b/persistence/db-framework/build.gradle
@@ -30,7 +30,7 @@
dependencies {
api libs.support.annotations
- api project(":persistence:db")
+ api(project(":persistence:db"))
}
supportLibrary {
diff --git a/preference-leanback/build.gradle b/preference-leanback/build.gradle
index 85d2577..f4d2fd6 100644
--- a/preference-leanback/build.gradle
+++ b/preference-leanback/build.gradle
@@ -6,12 +6,12 @@
}
dependencies {
- api project(':support-v4')
- api project(':appcompat-v7')
- api project(':recyclerview-v7')
- api project(':preference-v7')
- api project(':preference-v14')
- api project(':leanback-v17')
+ api(project(":support-v4"))
+ api(project(":appcompat-v7"))
+ api(project(":recyclerview-v7"))
+ api(project(":preference-v7"))
+ api(project(":preference-v14"))
+ api(project(":leanback-v17"))
}
android {
diff --git a/recommendation/build.gradle b/recommendation/build.gradle
index f6adcb9..83fa375 100644
--- a/recommendation/build.gradle
+++ b/recommendation/build.gradle
@@ -6,7 +6,7 @@
}
dependencies {
- api project(':support-annotations')
+ api(project(":support-annotations"))
}
android {
diff --git a/recyclerview-selection/build.gradle b/recyclerview-selection/build.gradle
index ab1ab23..9234fd8 100644
--- a/recyclerview-selection/build.gradle
+++ b/recyclerview-selection/build.gradle
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
+
plugins {
id("SupportAndroidLibraryPlugin")
}
@@ -23,14 +25,13 @@
api project(':support-annotations')
api project(':support-compat')
- androidTestImplementation libs.junit
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(JUNIT)
}
-
android {
defaultConfig {
minSdkVersion 14
diff --git a/room/common/build.gradle b/room/common/build.gradle
index dea4b9a..05b63c9 100644
--- a/room/common/build.gradle
+++ b/room/common/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension;
@@ -24,8 +25,8 @@
dependencies {
compile libs.support.annotations
- testCompile libs.junit
- testCompile libs.mockito_core
+ testCompile(JUNIT)
+ testCompile(MOCKITO_CORE)
}
supportLibrary {
diff --git a/room/compiler/build.gradle b/room/compiler/build.gradle
index 56a0c27..60b2cfc 100644
--- a/room/compiler/build.gradle
+++ b/room/compiler/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -39,8 +40,8 @@
// taken from ButterKnife
def logger = new com.android.build.gradle.internal.LoggerWrapper(project.logger)
def sdkHandler = new com.android.build.gradle.internal.SdkHandler(project, logger)
- compile project(":room:common")
- compile project(":room:migration")
+ compile(project(":room:common"))
+ compile(project(":room:migration"))
compile libs.kotlin.stdlib
compile libs.auto_common
compile libs.javapoet
@@ -49,10 +50,10 @@
compile libs.apache.commons.codec
testCompile libs.google_compile_testing
testCompile project(":paging:common")
- testCompile libs.junit
+ testCompile(JUNIT)
testCompile libs.ij_annotations
testCompile libs.jsr250
- testCompile libs.mockito_core
+ testCompile(MOCKITO_CORE)
testCompile fileTree(dir: "${sdkHandler.sdkFolder}/platforms/android-$tools.current_sdk/",
include : "android.jar")
testCompile fileTree(dir: "${new File(project(":room:runtime").buildDir, "libJar")}",
diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
index 4545c07..63759a7 100644
--- a/room/integration-tests/kotlintestapp/build.gradle
+++ b/room/integration-tests/kotlintestapp/build.gradle
@@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import static android.support.dependencies.DependenciesKt.*
+
apply plugin: 'com.android.application'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android'
@@ -57,21 +60,21 @@
}
dependencies {
- implementation project(":room:common")
- implementation project(":persistence:db")
- implementation project(":persistence:db-framework")
- implementation project(':room:runtime')
- implementation project(':arch:runtime')
+ implementation(project(":room:common"))
+ implementation(project(":persistence:db"))
+ implementation(project(":persistence:db-framework"))
+ implementation(project(":room:runtime"))
+ implementation(project(":arch:runtime"))
implementation libs.support.app_compat, libs.support_exclude_config
kapt project(":room:compiler")
kaptAndroidTest project(":room:compiler")
- androidTestImplementation(libs.test_runner) {
+ androidTestImplementation(TEST_RUNNER) {
exclude module: 'support-annotations'
exclude module: 'hamcrest-core'
}
- androidTestImplementation(libs.espresso_core, {
+ androidTestImplementation(ESPRESSO_CORE, {
exclude group: 'com.android.support', module: 'support-annotations'
exclude module: "hamcrest-core"
})
@@ -83,7 +86,7 @@
androidTestImplementation project(':room:rxjava2')
androidTestImplementation project(':arch:core-testing')
androidTestImplementation libs.rx_java
- testImplementation libs.mockito_core
+ testImplementation(MOCKITO_CORE)
}
tasks['check'].dependsOn(tasks['connectedCheck'])
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index 53ed69a..78dd295 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import static android.support.dependencies.DependenciesKt.*
+
apply plugin: 'com.android.application'
project.ext.noDocs = true
@@ -55,18 +58,18 @@
}
dependencies {
- implementation project(":room:common")
- implementation project(":persistence:db")
- implementation project(":persistence:db-framework")
- implementation project(':room:runtime')
- implementation project(':arch:runtime')
- implementation project(':arch:common')
- implementation project(':paging:common')
- implementation project(':lifecycle:extensions')
- implementation project(':lifecycle:runtime')
- implementation project(':lifecycle:common')
- implementation project(':room:rxjava2')
- implementation project(':paging:runtime')
+ implementation(project(":room:common"))
+ implementation(project(":persistence:db"))
+ implementation(project(":persistence:db-framework"))
+ implementation(project(":room:runtime"))
+ implementation(project(":arch:runtime"))
+ implementation(project(":arch:common"))
+ implementation(project(":paging:common"))
+ implementation(project(":lifecycle:extensions"))
+ implementation(project(":lifecycle:runtime"))
+ implementation(project(":lifecycle:common"))
+ implementation(project(":room:rxjava2"))
+ implementation(project(":paging:runtime"))
implementation libs.support.recyclerview, libs.support_exclude_config
implementation libs.support.app_compat, libs.support_exclude_config
@@ -74,23 +77,19 @@
androidTestAnnotationProcessor project(":room:compiler")
// IJ's gradle integration just cannot figure this out ...
- androidTestImplementation project(':lifecycle:extensions')
- androidTestImplementation project(':lifecycle:common')
- androidTestImplementation project(':lifecycle:runtime')
- androidTestImplementation project(':room:testing')
- androidTestImplementation project(':room:rxjava2')
- androidTestImplementation project(':arch:core-testing')
- androidTestImplementation libs.rx_java
- androidTestImplementation(libs.test_runner) {
- exclude module: 'support-annotations'
- }
- androidTestImplementation(libs.espresso_core, {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it's own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it's own MockMaker
+ androidTestImplementation(project(":lifecycle:extensions"))
+ androidTestImplementation(project(":lifecycle:common"))
+ androidTestImplementation(project(":lifecycle:runtime"))
+ androidTestImplementation(project(":room:testing"))
+ androidTestImplementation(project(":room:rxjava2"))
+ androidTestImplementation(project(":arch:core-testing"))
+ androidTestImplementation(libs.rx_java)
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker
- testImplementation libs.junit
+ testImplementation(JUNIT)
}
tasks['check'].dependsOn(tasks['connectedCheck'])
diff --git a/room/migration/build.gradle b/room/migration/build.gradle
index 086aac7..f2a8aed 100644
--- a/room/migration/build.gradle
+++ b/room/migration/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension;
@@ -26,12 +27,12 @@
test.java.srcDirs += 'src/tests/kotlin'
}
dependencies {
- compile project(":room:common")
+ compile(project(":room:common"))
compile libs.kotlin.stdlib
compile libs.gson
- testCompile libs.junit
+ testCompile(JUNIT)
testCompile libs.ij_annotations
- testCompile libs.mockito_core
+ testCompile(MOCKITO_CORE)
}
supportLibrary {
diff --git a/room/runtime/build.gradle b/room/runtime/build.gradle
index 85bcc40..ecbd0b3 100644
--- a/room/runtime/build.gradle
+++ b/room/runtime/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -33,23 +34,23 @@
}
dependencies {
- api project(":room:common")
- api project(":persistence:db-framework")
- api project(":persistence:db")
- api project(":arch:runtime")
+ api(project(":room:common"))
+ api(project(":persistence:db-framework"))
+ api(project(":persistence:db"))
+ api(project(":arch:runtime"))
compileOnly project(":paging:common")
compileOnly project(":lifecycle:runtime")
compileOnly project(":lifecycle:extensions")
api libs.support.core_utils, libs.support_exclude_config
- testImplementation project(":arch:core-testing")
- testImplementation libs.junit
- testImplementation libs.mockito_core
+ testImplementation(project(":arch:core-testing"))
+ testImplementation(JUNIT)
+ testImplementation(MOCKITO_CORE)
testImplementation libs.support.annotations
- androidTestImplementation libs.junit
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
+ androidTestImplementation(JUNIT)
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
}
// Used by testCompile in room-compiler
diff --git a/room/rxjava2/build.gradle b/room/rxjava2/build.gradle
index 1b6daba..6e95051 100644
--- a/room/rxjava2/build.gradle
+++ b/room/rxjava2/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -29,14 +30,14 @@
}
dependencies {
- api project(":room:common")
- api project(":room:runtime")
- api project(":arch:runtime")
+ api(project(":room:common"))
+ api(project(":room:runtime"))
+ api(project(":arch:runtime"))
api libs.support.core_utils, libs.support_exclude_config
api libs.rx_java
- testImplementation libs.junit
- testImplementation libs.mockito_core
- testImplementation project(":arch:core-testing")
+ testImplementation(JUNIT)
+ testImplementation(MOCKITO_CORE)
+ testImplementation(project(":arch:core-testing"))
}
supportLibrary {
diff --git a/room/testing/build.gradle b/room/testing/build.gradle
index 3556541..b71c8bc 100644
--- a/room/testing/build.gradle
+++ b/room/testing/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
import android.support.SupportLibraryExtension
@@ -29,14 +30,14 @@
}
dependencies {
- api project(":room:common")
- api project(":room:runtime")
- api project(":persistence:db")
- api project(":persistence:db-framework")
- api project(":room:migration")
- api project(":arch:runtime")
+ api(project(":room:common"))
+ api(project(":room:runtime"))
+ api(project(":persistence:db"))
+ api(project(":persistence:db-framework"))
+ api(project(":room:migration"))
+ api(project(":arch:runtime"))
api libs.support.core_utils, libs.support_exclude_config
- api libs.junit
+ api(JUNIT)
}
supportLibrary {
diff --git a/samples/Support13Demos/build.gradle b/samples/Support13Demos/build.gradle
index 99175b3..ba2c2e4 100644
--- a/samples/Support13Demos/build.gradle
+++ b/samples/Support13Demos/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-v13')
+ implementation(project(":support-v13"))
}
android {
diff --git a/samples/Support4Demos/build.gradle b/samples/Support4Demos/build.gradle
index 8e76229..3257e6a 100644
--- a/samples/Support4Demos/build.gradle
+++ b/samples/Support4Demos/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-v4')
+ implementation(project(":support-v4"))
}
android {
diff --git a/samples/Support7Demos/build.gradle b/samples/Support7Demos/build.gradle
index 14d128a..6b2468b 100644
--- a/samples/Support7Demos/build.gradle
+++ b/samples/Support7Demos/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':appcompat-v7')
- implementation project(':cardview-v7')
- implementation project(':gridlayout-v7')
- implementation project(':mediarouter-v7')
- implementation project(':palette-v7')
- implementation project(':recyclerview-v7')
+ implementation(project(":appcompat-v7"))
+ implementation(project(":cardview-v7"))
+ implementation(project(":gridlayout-v7"))
+ implementation(project(":mediarouter-v7"))
+ implementation(project(":palette-v7"))
+ implementation(project(":recyclerview-v7"))
implementation project(':recyclerview-selection')
}
diff --git a/samples/SupportAnimationDemos/build.gradle b/samples/SupportAnimationDemos/build.gradle
index 23e5030..bb86bd5 100644
--- a/samples/SupportAnimationDemos/build.gradle
+++ b/samples/SupportAnimationDemos/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-dynamic-animation')
+ implementation(project(":support-dynamic-animation"))
}
android {
diff --git a/samples/SupportAppNavigation/build.gradle b/samples/SupportAppNavigation/build.gradle
index 35a9d73..b242576 100644
--- a/samples/SupportAppNavigation/build.gradle
+++ b/samples/SupportAppNavigation/build.gradle
@@ -17,7 +17,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-v4')
+ implementation(project(":support-v4"))
}
android {
diff --git a/samples/SupportContentDemos/build.gradle b/samples/SupportContentDemos/build.gradle
index 1ed1134..898774c 100644
--- a/samples/SupportContentDemos/build.gradle
+++ b/samples/SupportContentDemos/build.gradle
@@ -17,9 +17,9 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':design')
- implementation project(':appcompat-v7')
- implementation project(':support-content')
+ implementation(project(":design"))
+ implementation(project(":appcompat-v7"))
+ implementation(project(":support-content"))
}
android {
diff --git a/samples/SupportDesignDemos/build.gradle b/samples/SupportDesignDemos/build.gradle
index 7abaa0e..ed111f3 100644
--- a/samples/SupportDesignDemos/build.gradle
+++ b/samples/SupportDesignDemos/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':design')
+ implementation(project(":design"))
}
android {
diff --git a/samples/SupportEmojiDemos/build.gradle b/samples/SupportEmojiDemos/build.gradle
index abc8328..dea5bf4 100644
--- a/samples/SupportEmojiDemos/build.gradle
+++ b/samples/SupportEmojiDemos/build.gradle
@@ -21,9 +21,9 @@
}
dependencies {
- implementation project(':support-emoji')
- implementation project(':support-emoji-bundled')
- implementation project(':support-emoji-appcompat')
+ implementation(project(":support-emoji"))
+ implementation(project(":support-emoji-bundled"))
+ implementation(project(":support-emoji-appcompat"))
}
android {
diff --git a/samples/SupportLeanbackDemos/build.gradle b/samples/SupportLeanbackDemos/build.gradle
index 61d0209..a00d435 100644
--- a/samples/SupportLeanbackDemos/build.gradle
+++ b/samples/SupportLeanbackDemos/build.gradle
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':leanback-v17')
- implementation project(':preference-leanback-v17')
+ implementation(project(":leanback-v17"))
+ implementation(project(":preference-leanback-v17"))
implementation 'com.google.code.gson:gson:2.6.2'
}
diff --git a/samples/SupportLeanbackJank/build.gradle b/samples/SupportLeanbackJank/build.gradle
index eef9986..3ba2d64 100644
--- a/samples/SupportLeanbackJank/build.gradle
+++ b/samples/SupportLeanbackJank/build.gradle
@@ -2,8 +2,8 @@
dependencies {
implementation 'com.github.bumptech.glide:glide:3.6.1'
- implementation project(':leanback-v17')
- implementation project(':preference-leanback-v17')
+ implementation(project(":leanback-v17"))
+ implementation(project(":preference-leanback-v17"))
}
android {
diff --git a/samples/SupportPercentDemos/build.gradle b/samples/SupportPercentDemos/build.gradle
index cec4b03..353e034 100644
--- a/samples/SupportPercentDemos/build.gradle
+++ b/samples/SupportPercentDemos/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':percent')
+ implementation(project(":percent"))
}
android {
diff --git a/samples/SupportPreferenceDemos/build.gradle b/samples/SupportPreferenceDemos/build.gradle
index f720b92..742ceb7 100644
--- a/samples/SupportPreferenceDemos/build.gradle
+++ b/samples/SupportPreferenceDemos/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':appcompat-v7')
- implementation project(':recyclerview-v7')
- implementation project(':preference-v7')
- implementation project(':preference-v14')
- implementation project(':leanback-v17')
- implementation project(':preference-leanback-v17')
+ implementation(project(":appcompat-v7"))
+ implementation(project(":recyclerview-v7"))
+ implementation(project(":preference-v7"))
+ implementation(project(":preference-v14"))
+ implementation(project(":leanback-v17"))
+ implementation(project(":preference-leanback-v17"))
}
android {
diff --git a/samples/SupportTransitionDemos/build.gradle b/samples/SupportTransitionDemos/build.gradle
index 8719221..47c84ad 100644
--- a/samples/SupportTransitionDemos/build.gradle
+++ b/samples/SupportTransitionDemos/build.gradle
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':transition')
- implementation project(':appcompat-v7')
+ implementation(project(":transition"))
+ implementation(project(":appcompat-v7"))
}
android {
diff --git a/samples/SupportVectorDrawableDemos/build.gradle b/samples/SupportVectorDrawableDemos/build.gradle
index e9c9d2c..09bb2d5 100644
--- a/samples/SupportVectorDrawableDemos/build.gradle
+++ b/samples/SupportVectorDrawableDemos/build.gradle
@@ -17,9 +17,9 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':support-vector-drawable')
- implementation project(':animated-vector-drawable')
- implementation project(':appcompat-v7')
+ implementation(project(":support-vector-drawable"))
+ implementation(project(":animated-vector-drawable"))
+ implementation(project(":appcompat-v7"))
}
android {
diff --git a/samples/SupportWearDemos/build.gradle b/samples/SupportWearDemos/build.gradle
index ae0f195..96da969 100644
--- a/samples/SupportWearDemos/build.gradle
+++ b/samples/SupportWearDemos/build.gradle
@@ -17,7 +17,7 @@
apply plugin: 'com.android.application'
dependencies {
- implementation project(':wear')
+ implementation(project(":wear"))
implementation project(path: ':appcompat-v7')
}
diff --git a/testutils/build.gradle b/testutils/build.gradle
index 6ecc012..d99826d 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -14,19 +14,21 @@
* limitations under the License.
*/
+import static android.support.dependencies.DependenciesKt.*
+
plugins {
id("SupportAndroidLibraryPlugin")
}
dependencies {
- api project(':support-fragment')
- api project(':appcompat-v7')
+ api(project(":support-fragment"))
+ api(project(":appcompat-v7"))
- compile libs.test_runner, { exclude module: 'support-annotations' }
- compile libs.espresso_core, { exclude module: 'support-annotations' }
- compile libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has its own MockMaker
- compile libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has its own MockMaker
- compile libs.junit
+ implementation(TEST_RUNNER, libs.exclude_annotations)
+ implementation(ESPRESSO_CORE, libs.exclude_annotations)
+ implementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ implementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ implementation(JUNIT)
}
android {
diff --git a/transition/build.gradle b/transition/build.gradle
index cd2c237..3e78cfe 100644
--- a/transition/build.gradle
+++ b/transition/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,16 +7,16 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-compat')
+ api(project(":support-annotations"))
+ api(project(":support-compat"))
compileOnly project(':support-fragment')
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation project(':support-v4')
- androidTestImplementation project(':appcompat-v7')
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(project(":support-v4"))
+ androidTestImplementation(project(":appcompat-v7"))
}
android {
diff --git a/tv-provider/build.gradle b/tv-provider/build.gradle
index 60c2b2e..eb5d297 100644
--- a/tv-provider/build.gradle
+++ b/tv-provider/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,10 +7,10 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-compat')
+ api(project(":support-annotations"))
+ api(project(":support-compat"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
}
android {
diff --git a/v13/build.gradle b/v13/build.gradle
index bd01c55..0f5c9b6 100644
--- a/v13/build.gradle
+++ b/v13/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,13 +7,13 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-v4')
+ api(project(":support-annotations"))
+ api(project(":support-v4"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
android {
diff --git a/v14/preference/build.gradle b/v14/preference/build.gradle
index f68379a..c129cba 100644
--- a/v14/preference/build.gradle
+++ b/v14/preference/build.gradle
@@ -22,10 +22,10 @@
}
dependencies {
- api project(':support-v4')
- api project(':appcompat-v7')
- api project(':recyclerview-v7')
- api project(':preference-v7')
+ api(project(":support-v4"))
+ api(project(":appcompat-v7"))
+ api(project(":recyclerview-v7"))
+ api(project(":preference-v7"))
}
android {
diff --git a/v4/build.gradle b/v4/build.gradle
index 0a17101..ac5a9f5 100644
--- a/v4/build.gradle
+++ b/v4/build.gradle
@@ -6,11 +6,11 @@
}
dependencies {
- api project(':support-compat')
- api project(':support-media-compat')
- api project(':support-core-utils')
- api project(':support-core-ui')
- api project(':support-fragment')
+ api(project(":support-compat"))
+ api(project(":support-media-compat"))
+ api(project(":support-core-utils"))
+ api(project(":support-core-ui"))
+ api(project(":support-fragment"))
}
android {
diff --git a/v7/appcompat/build.gradle b/v7/appcompat/build.gradle
index 8e242cc..214c6db 100644
--- a/v7/appcompat/build.gradle
+++ b/v7/appcompat/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,16 +7,16 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-core-utils')
- api project(':support-fragment')
- api project(':support-vector-drawable')
- api project(':animated-vector-drawable')
+ api(project(":support-annotations"))
+ api(project(":support-core-utils"))
+ api(project(":support-fragment"))
+ api(project(":support-vector-drawable"))
+ api(project(":animated-vector-drawable"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':support-testutils'), {
exclude group: 'com.android.support', module: 'appcompat-v7'
}
@@ -23,7 +24,7 @@
android {
defaultConfig {
- minSdkVersion 14
+ minSdkVersion(14)
// This disables the builds tools automatic vector -> PNG generation
generatedDensities = []
}
diff --git a/v7/cardview/build.gradle b/v7/cardview/build.gradle
index 23d8076..a6f98e1 100644
--- a/v7/cardview/build.gradle
+++ b/v7/cardview/build.gradle
@@ -6,16 +6,16 @@
}
dependencies {
- api project(':support-annotations')
+ api(project(":support-annotations"))
}
android {
defaultConfig {
- minSdkVersion 14
+ minSdkVersion(14)
}
sourceSets {
- main.res.srcDir 'res'
+ main.res.srcDir("res")
}
}
diff --git a/v7/gridlayout/build.gradle b/v7/gridlayout/build.gradle
index 052b9db..dc3a494 100644
--- a/v7/gridlayout/build.gradle
+++ b/v7/gridlayout/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,11 +7,11 @@
}
dependencies {
- api project(':support-compat')
- api project(':support-core-ui')
+ api(project(":support-compat"))
+ api(project(":support-core-ui"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
}
android {
diff --git a/v7/mediarouter/build.gradle b/v7/mediarouter/build.gradle
index 09e48df..0c94194 100644
--- a/v7/mediarouter/build.gradle
+++ b/v7/mediarouter/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,13 +7,13 @@
}
dependencies {
- api project(":support-media-compat")
- api project(":appcompat-v7")
- api project(":palette-v7")
+ api(project(":support-media-compat"))
+ api(project(":appcompat-v7"))
+ api(project(":palette-v7"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.test_rules
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(TEST_RULES)
}
android {
diff --git a/v7/palette/build.gradle b/v7/palette/build.gradle
index 2703f2c..95c0799 100644
--- a/v7/palette/build.gradle
+++ b/v7/palette/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,10 +7,10 @@
}
dependencies {
- api project(':support-compat')
- api project(':support-core-utils')
+ api(project(":support-compat"))
+ api(project(":support-core-utils"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
}
android {
diff --git a/v7/preference/build.gradle b/v7/preference/build.gradle
index f5bc372..16af11e 100644
--- a/v7/preference/build.gradle
+++ b/v7/preference/build.gradle
@@ -14,6 +14,7 @@
* limitations under the License
*/
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -22,14 +23,14 @@
}
dependencies {
- api project(':support-v4')
- api project(':appcompat-v7')
- api project(':recyclerview-v7')
+ api(project(":support-v4"))
+ api(project(":appcompat-v7"))
+ api(project(":recyclerview-v7"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
android {
diff --git a/v7/recyclerview/build.gradle b/v7/recyclerview/build.gradle
index daac4ab..b98e7f7 100644
--- a/v7/recyclerview/build.gradle
+++ b/v7/recyclerview/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,33 +7,33 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-compat')
- api project(':support-core-ui')
+ api(project(":support-annotations"))
+ api(project(":support-compat"))
+ api(project(":support-core-ui"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.junit
- androidTestImplementation project(':support-testutils')
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(JUNIT)
+ androidTestImplementation(project(":support-testutils"))
- testImplementation libs.junit
- testImplementation libs.mockito_core
- testImplementation libs.test_runner, { exclude module: 'support-annotations' }
+ testImplementation(JUNIT)
+ testImplementation(MOCKITO_CORE)
+ testImplementation(TEST_RUNNER, libs.exclude_annotations)
}
android {
defaultConfig {
- minSdkVersion 14
+ minSdkVersion(14)
}
sourceSets {
- main.res.srcDirs 'res', 'res-public'
+ main.res.srcDirs "res", "res-public"
}
buildTypes.all {
- consumerProguardFiles 'proguard-rules.pro'
+ consumerProguardFiles("proguard-rules.pro")
}
}
diff --git a/wear/build.gradle b/wear/build.gradle
index 458f722..55320b9 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,3 +1,4 @@
+import static android.support.dependencies.DependenciesKt.*
import android.support.LibraryGroups
import android.support.LibraryVersions
@@ -6,16 +7,16 @@
}
dependencies {
- api project(':support-annotations')
- api project(':support-core-ui')
- api project(':support-fragment')
- api project(':percent')
- api project(':recyclerview-v7')
+ api(project(":support-annotations"))
+ api(project(":support-core-ui"))
+ api(project(":support-fragment"))
+ api(project(":percent"))
+ api(project(":recyclerview-v7"))
- androidTestImplementation libs.test_runner, { exclude module: 'support-annotations' }
- androidTestImplementation libs.espresso_core, { exclude module: 'support-annotations' }
- androidTestImplementation libs.mockito_core, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
- androidTestImplementation libs.dexmaker_mockito, { exclude group: 'net.bytebuddy' } // DexMaker has it"s own MockMaker
+ androidTestImplementation(TEST_RUNNER, libs.exclude_annotations)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_annotations)
+ androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
+ androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
provided fileTree(dir: 'wear_stubs', include: ['com.google.android.wearable-stubs.jar'])
}
