From 4f3c8c1e8acbb7938a2e87b223a5ea673a0ae49e Mon Sep 17 00:00:00 2001 From: cmathew Date: Sun, 21 Apr 2024 22:19:40 -0700 Subject: [PATCH] use version catalog for libs and plugins --- build.gradle | 20 ++--- buildSrc/src/main/java/Libs.kt | 99 ------------------------ buildSrc/src/main/java/Versions.kt | 39 ---------- gradle/libs.versions.toml | 100 +++++++++++++++++++++++++ gradle/static-analysis.gradle | 2 +- internal-test-support/build.gradle | 4 +- magellan-legacy/build.gradle | 18 ++--- magellan-library/build.gradle | 30 ++++---- magellan-lint/build.gradle | 16 ++-- magellan-rx/build.gradle | 10 +-- magellan-rx2/build.gradle | 10 +-- magellan-sample-advanced/build.gradle | 60 +++++++-------- magellan-sample-migration/build.gradle | 54 ++++++------- magellan-sample/build.gradle | 24 +++--- magellan-support/build.gradle | 10 +-- magellan-test/build.gradle | 8 +- 16 files changed, 228 insertions(+), 276 deletions(-) delete mode 100644 buildSrc/src/main/java/Libs.kt create mode 100644 gradle/libs.versions.toml diff --git a/build.gradle b/build.gradle index 5ade326e..bad3a330 100644 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - jcenter() - mavenCentral() - maven { url "https://plugins.gradle.org/m2/" } - google() - } - dependencies { - classpath(Plugins.kotlinGradle) - classpath(Plugins.kotlinterGradle) - classpath(Plugins.kotlinAllOpen) - classpath(Plugins.detekt) - } +plugins { + alias(libs.plugins.kotlin.gradle).apply(false) + alias(libs.plugins.kotlinter.gradle).apply(false) + alias(libs.plugins.kotlin.allopen).apply(false) + alias(libs.plugins.detekt) } -apply plugin: 'io.gitlab.arturbosch.detekt' - allprojects { apply from: "$rootDir/gradle/static-analysis.gradle" apply plugin: "kotlin-allopen" diff --git a/buildSrc/src/main/java/Libs.kt b/buildSrc/src/main/java/Libs.kt deleted file mode 100644 index 6a87a06a..00000000 --- a/buildSrc/src/main/java/Libs.kt +++ /dev/null @@ -1,99 +0,0 @@ -import Versions.androidXCoreVersion -import Versions.archVersion -import Versions.butterKnifeVersion -import Versions.constraintLayoutVersion -import Versions.coroutinesVersion -import Versions.daggerVersion -import Versions.detektVersion -import Versions.espressoVersion -import Versions.glideVersion -import Versions.jacksonVersion -import Versions.javaInjectVersion -import Versions.jodaTimeVersion -import Versions.junitTestExtVersion -import Versions.junitVersion -import Versions.kotlinVersion -import Versions.kotlinterVersion -import Versions.lifecycleVersion -import Versions.lintVersion -import Versions.materialVersion -import Versions.mockKVersion -import Versions.mockitoVersion -import Versions.okhttpVersion -import Versions.recyclerViewVersion -import Versions.retrofitVersion -import Versions.robolectricVersion -import Versions.rxAndroid2Version -import Versions.rxandroidVersion -import Versions.rxjava2Version -import Versions.rxjavaAdapterVersion -import Versions.rxjavaVersion -import Versions.supportLibVersion -import Versions.testCoreVersion -import Versions.testRunnerVersion -import Versions.truthVersion -import Versions.uiAutomatorVersion - -object Plugins { - const val kotlinGradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - const val kotlinterGradle = "org.jmailen.gradle:kotlinter-gradle:$kotlinterVersion" - const val kotlinAllOpen = "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion" - const val detekt = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion" -} - -object Libs { - - const val appCompat = "androidx.appcompat:appcompat:$supportLibVersion" - const val constraintLayout = "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion" - const val lifecycle = "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion" - const val androidXCore = "androidx.core:core-ktx:$androidXCoreVersion" - - const val material = "com.google.android.material:material:$materialVersion" - const val recyclerView = "androidx.recyclerview:recyclerview:$recyclerViewVersion" - const val junit = "junit:junit:$junitVersion" - const val truth = "com.google.truth:truth:$truthVersion" - const val mockito = "org.mockito:mockito-core:$mockitoVersion" - const val mockitoAndroid = "org.mockito:mockito-android:$mockitoVersion" - const val mockK = "io.mockk:mockk:$mockKVersion" - const val archTesting = "androidx.arch.core:core-testing:$archVersion" - const val robolectric = "org.robolectric:robolectric:$robolectricVersion" - const val butterknife = "com.jakewharton:butterknife:$butterKnifeVersion" - const val butterknifeCompiler = "com.jakewharton:butterknife-compiler:$butterKnifeVersion" - const val dagger = "com.google.dagger:dagger:$daggerVersion" - const val daggerCompiler = "com.google.dagger:dagger-compiler:$daggerVersion" - const val inject = "javax.inject:javax.inject:$javaInjectVersion" - const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - const val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - const val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion" - - const val glide = "com.github.bumptech.glide:glide:$glideVersion" - const val retrofit = "com.squareup.retrofit2:retrofit:$retrofitVersion" - const val retrofitMock = "com.squareup.retrofit2:retrofit-mock:$retrofitVersion" - const val rxjavaAdapter = "com.squareup.retrofit2:adapter-rxjava:$rxjavaAdapterVersion" - const val rxJava2Adapter = "com.squareup.retrofit2:adapter-rxjava2:$rxjavaAdapterVersion" - const val rxjava = "io.reactivex:rxjava:$rxjavaVersion" - const val rxjava2 = "io.reactivex.rxjava2:rxjava:$rxjava2Version" - const val rxandroid = "io.reactivex:rxandroid:$rxandroidVersion" - const val rxAndroid2 = "io.reactivex.rxjava2:rxandroid:$rxAndroid2Version" - const val jackson = "com.squareup.retrofit2:converter-jackson:$jacksonVersion" - const val okhttp = "com.squareup.okhttp3:logging-interceptor:$okhttpVersion" - const val jodaTime = "net.danlew:android.joda:$jodaTimeVersion" - - const val testCore = "androidx.test:core:$testCoreVersion" - const val testCoreKtx = "androidx.test:core-ktx:$testCoreVersion" - const val testRunner = "androidx.test:runner:$testRunnerVersion" - const val testRules = "com.android.support.test:rules:$testRunnerVersion" - const val uiAutomator ="androidx.test.uiautomator:uiautomator:$uiAutomatorVersion" - const val extJunit = "androidx.test.ext:junit:$junitTestExtVersion" - const val extJunitKtx = "androidx.test.ext:junit-ktx:$junitTestExtVersion" - const val espressoCore = "androidx.test.espresso:espresso-core:$espressoVersion" - const val espressoContrib = "androidx.test.espresso:espresso-contrib:$espressoVersion" - const val rx2idler = "com.squareup.rx.idler:rx2-idler:0.11.0" - - const val lintApi = "com.android.tools.lint:lint-api:$lintVersion" - const val lintChecks = "com.android.tools.lint:lint-checks:$lintVersion" - const val lint = "com.android.tools.lint:lint:$lintVersion" - const val lintTests = "com.android.tools.lint:lint-tests:$lintVersion" - const val testUtils = "com.android.tools:testutils:$lintVersion" -} - diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index e88a396a..a53d4956 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -2,43 +2,4 @@ object Versions { const val compileSdkVersion = 30 const val minSdkVersion = 21 const val targetSdkVersion = 30 - - const val kotlinVersion = "1.8.21" - const val kotlinterVersion = "3.9.0" - const val detektVersion = "1.19.0" - const val supportLibVersion = "1.3.1" - const val constraintLayoutVersion = "2.1.0" - const val robolectricVersion = "4.8" - const val archVersion = "2.1.0" - const val lifecycleVersion = "2.2.0" - const val androidXCoreVersion = "1.6.0" - const val butterKnifeVersion = "10.0.0" - const val daggerVersion = "2.48" - const val javaInject = "1" - const val retrofitVersion = "2.9.0" - const val glideVersion = "4.11.0" - const val rxjavaVersion = "1.3.8" - const val rxjava2Version = "2.2.19" - const val rxjavaAdapterVersion = "2.3.0" - const val rxandroidVersion = "1.2.1" - const val rxAndroid2Version = "2.1.1" - const val jacksonVersion = "2.7.2" - const val okhttpVersion = "4.4.0" - const val jodaTimeVersion = "2.10.9.1" - const val javaInjectVersion = "1" - const val materialVersion = "1.4.0" - const val recyclerViewVersion = "1.2.1" - const val coroutinesVersion = "1.6.4" - - const val testCoreVersion = "1.4.0" - const val junitVersion = "4.13.2" - const val junitTestExtVersion = "1.1.3" - const val truthVersion = "1.0" - const val mockitoVersion = "2.23.4" - const val mockKVersion = "1.12.5" - const val testRunnerVersion = "1.4.0" - const val uiAutomatorVersion = "2.2.0" - const val espressoVersion = "3.4.0" - - const val lintVersion = "30.0.2" } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..86b2642d --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,100 @@ +[versions] +kotlin = "1.8.22" +kotlinter = "3.9.0" +detekt = "1.19.0" +supportLib = "1.3.1" +constraintLayout = "2.1.0" +robolectric = "4.8" +arch = "2.1.0" +lifecycle = "2.2.0" +androidXCore = "1.6.0" +butterKnife = "10.0.0" +dagger = "2.48" +javaInject = "1" +retrofit = "2.9.0" +glide = "4.11.0" +rxjava = "1.3.8" +rxjava2 = "2.2.19" +rxjavaAdapter = "2.3.0" +rxandroid = "1.2.1" +rxAndroid2 = "2.1.1" +jackson = "2.7.2" +okhttp = "4.4.0" +jodaTime = "2.10.9.1" +javainject = "1" +material = "1.4.0" +recyclerView = "1.2.1" +coroutines = "1.6.4" + +testCore = "1.4.0" +junit = "4.13.2" +junitTestExt = "1.1.3" +truth = "1.0" +mockito = "2.23.4" +mockK = "1.12.5" +testRunner = "1.4.0" +uiAutomator = "2.2.0" +espresso = "3.4.0" + +lint = "30.0.2" + + +[libraries] +appCompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "supportLib" } +constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" } +lifecycle = { group = "androidx.lifecycle", name = "lifecycle-common-java8", version.ref = "lifecycle" } +androidXCore = { group = "androidx.core", name = "core-ktx", version.ref = "androidXCore" } + +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerView" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +truth = { group = "com.google.truth", name = "truth", version.ref = "truth" } +mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } +mockitoAndroid = { group = "org.mockito", name = "mockito-android", version.ref = "mockito" } +mockK = { group = "io.mockk", name = "mockk", version.ref = "mockK" } +archTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "arch" } +robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } +butterknife = { group = "com.jakewharton", name = "butterknife", version.ref = "butterKnife" } +butterknifeCompiler = { group = "com.jakewharton", name = "butterknife-compiler", version.ref = "butterKnife" } +dagger = { group = "com.google.dagger", name = "dagger", version.ref = "dagger" } +daggerCompiler = { group = "com.google.dagger", name = "dagger-compiler", version.ref = "dagger" } +inject = { group = "javax.inject", name = "javax.inject", version.ref = "javainject" } +coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" } +coroutinesAndroid = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" } +coroutinesTest = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } + +glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" } +retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +retrofitMock = { group = "com.squareup.retrofit2", name = "retrofit-mock", version.ref = "retrofit" } +rxjavaAdapter = { group = "com.squareup.retrofit2", name = "adapter-rxjava", version.ref = "rxjavaAdapter" } +rxJava2Adapter = { group = "com.squareup.retrofit2", name = "adapter-rxjava2", version.ref = "rxjavaAdapter" } +rxjava = { group = "io.reactivex", name = "rxjava", version.ref = "rxjava" } +rxjava2 = { group = "io.reactivex.rxjava2", name = "rxjava", version.ref = "rxjava2" } +rxandroid = { group = "io.reactivex", name = "rxandroid", version.ref = "rxandroid" } +rxAndroid2 = { group = "io.reactivex.rxjava2", name = "rxandroid", version.ref = "rxAndroid2" } +jackson = { group = "com.squareup.retrofit2", name = "converter-jackson", version.ref = "jackson" } +okhttp = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } +jodaTime = { group = "net.danlew", name = "android.joda", version.ref = "jodaTime" } + +testCore = { group = "androidx.test", name = "core", version.ref = "testCore" } +testCoreKtx = { group = "androidx.test", name = "core-ktx", version.ref = "testCore" } +testRunner = { group = "androidx.test", name = "runner", version.ref = "testRunner" } +testRules = { group = "com.android.support.test", name = "rules", version.ref = "testRunner" } +uiAutomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiAutomator" } +extJunit = { group = "androidx.test.ext", name = "junit", version.ref = "junitTestExt" } +extJunitKtx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "junitTestExt" } +espressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" } +espressoContrib = { group = "androidx.test.espresso", name = "espresso-contrib", version.ref = "espresso" } +rx2idler = { group = "com.squareup.rx.idler", name = "rx2-idler", version = "0.11.0" } + +lintApi = { group = "com.android.tools.lint", name = "lint-api", version.ref = "lint" } +lintChecks = { group = "com.android.tools.lint", name = "lint-checks", version.ref = "lint" } +lint = { group = "com.android.tools.lint", name = "lint", version.ref = "lint" } +lintTests = { group = "com.android.tools.lint", name = "lint-tests", version.ref = "lint" } +testUtils = { group = "com.android.tools", name = "testutils", version.ref = "lint" } + +[plugins] +kotlin-gradle = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlinter-gradle = { id = "org.jmailen.kotlinter", version.ref = "kotlinter" } +kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } \ No newline at end of file diff --git a/gradle/static-analysis.gradle b/gradle/static-analysis.gradle index aebc4897..c6338566 100644 --- a/gradle/static-analysis.gradle +++ b/gradle/static-analysis.gradle @@ -23,7 +23,7 @@ kotlinter { } detekt { - toolVersion = Versions.detektVersion + toolVersion = "1.19.0" config = files("$rootDir/config/detekt/detekt-config.yml") parallel = true autoCorrect = true diff --git a/internal-test-support/build.gradle b/internal-test-support/build.gradle index 60de264d..6fd039e7 100644 --- a/internal-test-support/build.gradle +++ b/internal-test-support/build.gradle @@ -37,6 +37,6 @@ dependencies { implementation project(':magellan-library') implementation project(':magellan-legacy') - implementation Libs.inject - implementation Libs.appCompat + implementation libs.inject + implementation libs.appCompat } \ No newline at end of file diff --git a/magellan-legacy/build.gradle b/magellan-legacy/build.gradle index b2866de8..9bcb03d7 100644 --- a/magellan-legacy/build.gradle +++ b/magellan-legacy/build.gradle @@ -40,17 +40,17 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { dependencies { implementation project(':magellan-library') - implementation Libs.appCompat - implementation Libs.inject - implementation Libs.coroutines - implementation Libs.coroutinesAndroid + implementation libs.appCompat + implementation libs.inject + implementation libs.coroutines + implementation libs.coroutinesAndroid testImplementation project(':internal-test-support') - testImplementation Libs.testCore - testImplementation Libs.junit - testImplementation Libs.truth - testImplementation Libs.mockito - testImplementation Libs.robolectric + testImplementation libs.testCore + testImplementation libs.junit + testImplementation libs.truth + testImplementation libs.mockito + testImplementation libs.robolectric } apply from: rootProject.file('gradle/gradle-mvn-push.gradle') diff --git a/magellan-library/build.gradle b/magellan-library/build.gradle index d9606db0..a9048848 100644 --- a/magellan-library/build.gradle +++ b/magellan-library/build.gradle @@ -50,23 +50,23 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { } dependencies { - implementation Libs.appCompat - implementation Libs.lifecycle - implementation Libs.inject - implementation Libs.coroutines - implementation Libs.coroutinesAndroid + implementation libs.appCompat + implementation libs.lifecycle + implementation libs.inject + implementation libs.coroutines + implementation libs.coroutinesAndroid testImplementation project(':internal-test-support') - testImplementation Libs.testCore - testImplementation Libs.testCoreKtx - testImplementation Libs.junit - testImplementation Libs.extJunitKtx - testImplementation Libs.truth - testImplementation Libs.mockito - testImplementation Libs.mockK - testImplementation Libs.archTesting - testImplementation Libs.robolectric - testImplementation Libs.coroutinesTest + testImplementation libs.testCore + testImplementation libs.testCoreKtx + testImplementation libs.junit + testImplementation libs.extJunitKtx + testImplementation libs.truth + testImplementation libs.mockito + testImplementation libs.mockK + testImplementation libs.archTesting + testImplementation libs.robolectric + testImplementation libs.coroutinesTest // Bug in AGP: Follow this issue - https://issuetracker.google.com/issues/141840950 // lintPublish project(':magellan-lint') diff --git a/magellan-lint/build.gradle b/magellan-lint/build.gradle index e2aff183..323924b8 100644 --- a/magellan-lint/build.gradle +++ b/magellan-lint/build.gradle @@ -16,15 +16,15 @@ lintOptions { } dependencies { - compileOnly Libs.lintApi - compileOnly Libs.lintChecks + compileOnly libs.lintApi + compileOnly libs.lintChecks - testImplementation Libs.junit - testImplementation Libs.truth - testImplementation Libs.lint - testImplementation Libs.lintTests - testImplementation Libs.testUtils - testImplementation(Libs.truth) { + testImplementation libs.junit + testImplementation libs.truth + testImplementation libs.lint + testImplementation libs.lintTests + testImplementation libs.testUtils + testImplementation(libs.truth) { exclude group: 'com.google.guava', module: 'guava' } } diff --git a/magellan-rx/build.gradle b/magellan-rx/build.gradle index cf524ab7..97d0aac0 100644 --- a/magellan-rx/build.gradle +++ b/magellan-rx/build.gradle @@ -39,12 +39,12 @@ dependencies { implementation project(':magellan-legacy') implementation project(':magellan-library') - implementation Libs.rxjava - implementation Libs.inject + implementation libs.rxjava + implementation libs.inject - testImplementation Libs.junit - testImplementation Libs.truth - testImplementation Libs.mockito + testImplementation libs.junit + testImplementation libs.truth + testImplementation libs.mockito } apply from: rootProject.file('gradle/gradle-mvn-push.gradle') diff --git a/magellan-rx2/build.gradle b/magellan-rx2/build.gradle index 607770e9..0b4b09e2 100644 --- a/magellan-rx2/build.gradle +++ b/magellan-rx2/build.gradle @@ -39,12 +39,12 @@ dependencies { implementation project(':magellan-legacy') implementation project(':magellan-library') - implementation Libs.rxjava2 - implementation Libs.inject + implementation libs.rxjava2 + implementation libs.inject - testImplementation Libs.junit - testImplementation Libs.truth - testImplementation Libs.mockito + testImplementation libs.junit + testImplementation libs.truth + testImplementation libs.mockito } apply from: rootProject.file('gradle/gradle-mvn-push.gradle') \ No newline at end of file diff --git a/magellan-sample-advanced/build.gradle b/magellan-sample-advanced/build.gradle index 44bd545d..6ea5f751 100644 --- a/magellan-sample-advanced/build.gradle +++ b/magellan-sample-advanced/build.gradle @@ -54,36 +54,36 @@ dependencies { implementation project(':magellan-library') implementation project(':magellan-rx2') - implementation Libs.androidXCore - implementation Libs.appCompat - implementation Libs.material - implementation Libs.constraintLayout - - implementation Libs.dagger - kapt Libs.daggerCompiler - - implementation Libs.retrofit - implementation Libs.rxjava - implementation Libs.rxAndroid2 - implementation Libs.retrofitMock - implementation Libs.rxJava2Adapter - implementation Libs.jackson - implementation Libs.okhttp - implementation Libs.coroutines - implementation Libs.coroutinesAndroid - - testImplementation Libs.junit - testImplementation Libs.testCore - testImplementation Libs.truth - testImplementation Libs.mockito - testImplementation Libs.robolectric - - androidTestImplementation Libs.rx2idler - androidTestImplementation Libs.testCore - androidTestImplementation Libs.testCoreKtx - androidTestImplementation Libs.espressoCore - androidTestImplementation Libs.testRunner - androidTestImplementation Libs.testRules + implementation libs.androidXCore + implementation libs.appCompat + implementation libs.material + implementation libs.constraintLayout + + implementation libs.dagger + kapt libs.daggerCompiler + + implementation libs.retrofit + implementation libs.rxjava + implementation libs.rxAndroid2 + implementation libs.retrofitMock + implementation libs.rxJava2Adapter + implementation libs.jackson + implementation libs.okhttp + implementation libs.coroutines + implementation libs.coroutinesAndroid + + testImplementation libs.junit + testImplementation libs.testCore + testImplementation libs.truth + testImplementation libs.mockito + testImplementation libs.robolectric + + androidTestImplementation libs.rx2idler + androidTestImplementation libs.testCore + androidTestImplementation libs.testCoreKtx + androidTestImplementation libs.espressoCore + androidTestImplementation libs.testRunner + androidTestImplementation libs.testRules androidTestImplementation 'androidx.test:runner:1.4.0' androidTestUtil 'androidx.test:orchestrator:1.4.1' diff --git a/magellan-sample-migration/build.gradle b/magellan-sample-migration/build.gradle index f0a01f16..24b60876 100644 --- a/magellan-sample-migration/build.gradle +++ b/magellan-sample-migration/build.gradle @@ -53,36 +53,36 @@ dependencies { implementation project(':magellan-library') implementation project(':magellan-legacy') - implementation Libs.appCompat - implementation Libs.dagger - kapt Libs.daggerCompiler + implementation libs.appCompat + implementation libs.dagger + kapt libs.daggerCompiler - implementation Libs.glide - implementation Libs.retrofit - implementation Libs.jackson - implementation Libs.okhttp - implementation Libs.coroutines - implementation Libs.coroutinesAndroid - implementation Libs.jodaTime - implementation Libs.recyclerView + implementation libs.glide + implementation libs.retrofit + implementation libs.jackson + implementation libs.okhttp + implementation libs.coroutines + implementation libs.coroutinesAndroid + implementation libs.jodaTime + implementation libs.recyclerView - kaptTest Libs.daggerCompiler - testImplementation Libs.junit - testImplementation Libs.testCore - testImplementation Libs.truth - testImplementation Libs.mockK - testImplementation Libs.robolectric - testImplementation Libs.truth + kaptTest libs.daggerCompiler + testImplementation libs.junit + testImplementation libs.testCore + testImplementation libs.truth + testImplementation libs.mockK + testImplementation libs.robolectric + testImplementation libs.truth - kaptAndroidTest Libs.daggerCompiler - androidTestImplementation Libs.extJunit - androidTestImplementation Libs.espressoCore - androidTestImplementation Libs.espressoContrib - androidTestImplementation Libs.testCore - androidTestImplementation Libs.testCoreKtx - androidTestImplementation Libs.testRunner - androidTestImplementation Libs.testRules - androidTestImplementation Libs.mockitoAndroid + kaptAndroidTest libs.daggerCompiler + androidTestImplementation libs.extJunit + androidTestImplementation libs.espressoCore + androidTestImplementation libs.espressoContrib + androidTestImplementation libs.testCore + androidTestImplementation libs.testCoreKtx + androidTestImplementation libs.testRunner + androidTestImplementation libs.testRules + androidTestImplementation libs.mockitoAndroid androidTestImplementation 'androidx.test:runner:1.4.0' androidTestUtil 'androidx.test:orchestrator:1.4.1' diff --git a/magellan-sample/build.gradle b/magellan-sample/build.gradle index 0e71a8ae..5c3ccef0 100644 --- a/magellan-sample/build.gradle +++ b/magellan-sample/build.gradle @@ -40,21 +40,21 @@ dependencies { implementation project(':magellan-library') implementation project(':magellan-legacy') - implementation Libs.appCompat - implementation Libs.material - implementation Libs.coroutines - implementation Libs.coroutinesAndroid + implementation libs.appCompat + implementation libs.material + implementation libs.coroutines + implementation libs.coroutinesAndroid - implementation Libs.dagger - kapt Libs.daggerCompiler + implementation libs.dagger + kapt libs.daggerCompiler - testImplementation Libs.junit + testImplementation libs.junit - androidTestImplementation Libs.testRunner - androidTestImplementation Libs.testRules - androidTestImplementation Libs.uiAutomator - androidTestImplementation Libs.extJunit - androidTestImplementation Libs.espressoCore + androidTestImplementation libs.testRunner + androidTestImplementation libs.testRules + androidTestImplementation libs.uiAutomator + androidTestImplementation libs.extJunit + androidTestImplementation libs.espressoCore lintPublish project(':magellan-lint') } diff --git a/magellan-support/build.gradle b/magellan-support/build.gradle index 1ea34410..a80d5761 100644 --- a/magellan-support/build.gradle +++ b/magellan-support/build.gradle @@ -33,10 +33,10 @@ android { dependencies { implementation project(':magellan-legacy') - implementation Libs.appCompat + implementation libs.appCompat - testImplementation Libs.junit - testImplementation Libs.truth - testImplementation Libs.mockito - testImplementation Libs.robolectric + testImplementation libs.junit + testImplementation libs.truth + testImplementation libs.mockito + testImplementation libs.robolectric } diff --git a/magellan-test/build.gradle b/magellan-test/build.gradle index 2bf0bce1..aae91b5f 100644 --- a/magellan-test/build.gradle +++ b/magellan-test/build.gradle @@ -35,11 +35,11 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { dependencies { implementation project(':magellan-library') - implementation Libs.inject + implementation libs.inject - testImplementation Libs.junit - testImplementation Libs.truth - testImplementation Libs.mockito + testImplementation libs.junit + testImplementation libs.truth + testImplementation libs.mockito } apply from: rootProject.file('gradle/gradle-mvn-push.gradle')