From f9bf93465022606503cfd1fac75c169e7a098eb6 Mon Sep 17 00:00:00 2001 From: psteiger Date: Mon, 14 Oct 2024 06:17:17 -0400 Subject: [PATCH] Use version catalog naming style for plugins --- android/build.gradle | 10 ++++---- android/conventions/build.gradle.kts | 2 +- .../ribs.spotless-convention.gradle.kts | 2 +- android/demos/compose/build.gradle | 8 +++---- android/demos/flipper/build.gradle | 8 +++---- android/demos/intellij/build.gradle | 2 +- android/demos/memory-leaks/build.gradle | 3 +-- android/demos/rib-workers/build.gradle | 6 ++--- android/gradle/libs.versions.toml | 23 ++++++++----------- android/gradle/test-libs.versions.toml | 6 ++--- .../rib-android-compose/build.gradle | 4 ++-- .../libraries/rib-android-core/build.gradle | 2 +- .../libraries/rib-android/build.gradle.kts | 4 ++-- android/libraries/rib-base/build.gradle | 8 +++---- .../libraries/rib-compiler-app/build.gradle | 4 ++-- .../libraries/rib-compiler-test/build.gradle | 6 ++--- .../rib-coroutines-test/build.gradle.kts | 5 ++-- android/libraries/rib-coroutines/build.gradle | 5 ++-- .../rib-debug-utils/build.gradle.kts | 2 +- .../rib-router-navigator/build.gradle | 4 ++-- .../rib-screen-stack-base/build.gradle | 2 +- android/libraries/rib-test/build.gradle.kts | 7 +++--- .../rib-workflow-test/build.gradle.kts | 2 +- android/libraries/rib-workflow/build.gradle | 4 ++-- .../tooling/rib-flipper-plugin/build.gradle | 2 +- .../tooling/rib-intellij-plugin/build.gradle | 15 ++---------- .../intellij-broadcast-rib/build.gradle | 2 +- .../intellij-broadcast-core/build.gradle | 2 +- .../tutorial3-completed/build.gradle | 2 +- android/tutorials/tutorial3/build.gradle | 2 +- android/tutorials/tutorial4/build.gradle | 2 +- 31 files changed, 67 insertions(+), 89 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 58a747b81..e6ced7596 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,11 +14,11 @@ * limitations under the License. */ plugins { - alias(libs.plugins.androidApplication) apply false - alias(libs.plugins.androidLibrary) apply false - alias(libs.plugins.kotlinAndroid) apply false - alias(libs.plugins.kotlinKapt) apply false - alias(libs.plugins.mavenPublish) apply false + alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false + alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.kapt) apply false + alias(libs.plugins.maven.publish) apply false alias(libs.plugins.errorprone) apply false alias(libs.plugins.nullaway) apply false alias(libs.plugins.intellij) apply false diff --git a/android/conventions/build.gradle.kts b/android/conventions/build.gradle.kts index 9f6ae882a..7a67f3e60 100644 --- a/android/conventions/build.gradle.kts +++ b/android/conventions/build.gradle.kts @@ -27,7 +27,7 @@ repositories { dependencies { // Workaround for using version catalog on precompiled scripts. // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192 - implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) + implementation(files((libs as Any).javaClass.superclass.protectionDomain.codeSource.location)) implementation(gradleApi()) implementation(libs.gradle.android.plugin) implementation(libs.gradle.kotlin.plugin) diff --git a/android/conventions/src/main/kotlin/ribs.spotless-convention.gradle.kts b/android/conventions/src/main/kotlin/ribs.spotless-convention.gradle.kts index bf1fbe417..6179af744 100644 --- a/android/conventions/src/main/kotlin/ribs.spotless-convention.gradle.kts +++ b/android/conventions/src/main/kotlin/ribs.spotless-convention.gradle.kts @@ -40,7 +40,7 @@ configure { } java { target("src/*/java/**/*.java") - googleJavaFormat(libs.versions.gjf.get()) + googleJavaFormat(libs.versions.google.java.format.get()) licenseHeaderFile(rootProject.file("config/spotless/copyright.java")) removeUnusedImports() trimTrailingWhitespace() diff --git a/android/demos/compose/build.gradle b/android/demos/compose/build.gradle index 0b7c75e54..b7cf81a2e 100644 --- a/android/demos/compose/build.gradle +++ b/android/demos/compose/build.gradle @@ -1,6 +1,6 @@ plugins { id("ribs.kotlin-android-application-conventions") - alias(libs.plugins.kotlinKapt) + alias(libs.plugins.kotlin.kapt) } android { @@ -42,9 +42,9 @@ dependencies { // Flipper Debug tool integration - debugImplementation 'com.facebook.flipper:flipper:0.93.0' - debugImplementation 'com.facebook.soloader:soloader:0.10.1' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.93.0' + debugImplementation(libs.flipper) + debugImplementation(libs.soloader) + releaseImplementation(libs.flipper.noop) // Flipper RIBs plugin implementation(project(":tooling:rib-flipper-plugin")) diff --git a/android/demos/flipper/build.gradle b/android/demos/flipper/build.gradle index efe0727be..5fa9e5e1a 100644 --- a/android/demos/flipper/build.gradle +++ b/android/demos/flipper/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-application-conventions") - alias(libs.plugins.kotlinKapt) + alias(libs.plugins.kotlin.kapt) } android { @@ -38,9 +38,9 @@ dependencies { testImplementation(project(":libraries:rib-test")) // Flipper Debug tool integration - debugImplementation 'com.facebook.flipper:flipper:0.93.0' - debugImplementation 'com.facebook.soloader:soloader:0.10.1' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.93.0' + debugImplementation(libs.flipper) + debugImplementation(libs.soloader) + releaseImplementation(libs.flipper.noop) // Flipper RIBs plugin implementation(project(":tooling:rib-flipper-plugin")) diff --git a/android/demos/intellij/build.gradle b/android/demos/intellij/build.gradle index 52110171f..2bb35c086 100644 --- a/android/demos/intellij/build.gradle +++ b/android/demos/intellij/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-application-conventions") - alias(libs.plugins.kotlinKapt) + alias(libs.plugins.kotlin.kapt) } android { diff --git a/android/demos/memory-leaks/build.gradle b/android/demos/memory-leaks/build.gradle index 6a83737f1..9b3aef3a6 100644 --- a/android/demos/memory-leaks/build.gradle +++ b/android/demos/memory-leaks/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-application-errorprone-conventions") - alias(libs.plugins.kotlinKapt) + alias(libs.plugins.kotlin.kapt) } android { @@ -30,7 +30,6 @@ dependencies { implementation(project(":libraries:rib-android")) kapt(project(":libraries:rib-compiler-app")) kapt(project(":libraries:rib-compiler-test")) - kapt(libs.autodispose.errorprone) kapt(libs.dagger.compiler) implementation(libs.dagger.library) implementation(libs.rxbinding) diff --git a/android/demos/rib-workers/build.gradle b/android/demos/rib-workers/build.gradle index 46eefe2cc..2dbce2cb0 100644 --- a/android/demos/rib-workers/build.gradle +++ b/android/demos/rib-workers/build.gradle @@ -40,9 +40,9 @@ dependencies { implementation(libs.autodispose.coroutines) implementation(libs.motif.library) - debugImplementation 'com.facebook.flipper:flipper:0.93.0' - debugImplementation 'com.facebook.soloader:soloader:0.10.1' - releaseImplementation 'com.facebook.flipper:flipper-noop:0.93.0' + debugImplementation(libs.flipper) + debugImplementation(libs.soloader) + releaseImplementation(libs.flipper.noop) implementation(project(":tooling:rib-flipper-plugin")) } diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 3004d9c4e..fd685fe8e 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -9,7 +9,6 @@ autodispose = "1.4.0" autoservice = "1.0-rc4" autovalue = "1.7" checkerqual = "2.5.1" -compile-testing = "0.17" compose-compiler = "1.4.6" compose-libraries = "1.4.0" compose-navigation = "2.4.0-alpha03" @@ -18,7 +17,7 @@ dagger = "2.43.2" errorprone = "2.3.3" errorprone-javac = "9+181-r4173-1" flipper = "0.93.0" -gjf = "1.16.0" +google-java-format = "1.16.0" gradle-android-plugin = "7.4.2" gradle-errorprone-plugin = "1.3.0" gradle-intellij-plugin = "1.15.0" @@ -31,14 +30,10 @@ guava-jre = "27.1-jre" intellij = "2023.2" javapoet = "1.11.1" jsr250 = "1.0" -junit = "4.12" kotlin = "1.8.20" -kotlinx-coroutines = "1.7.3" ktfmt = "0.43" ktlint = "0.48.2" leakcanary = "1.5.4" -mockito = "4.6.1" -mockito-kotlin = "4.0.0" motif = "0.3.4" percent = "1.0.0" reactivestreams = "1.0.0" @@ -47,8 +42,8 @@ rxbinding = "2.0.0" rxjava2 = "2.2.8" rxkotlin = "2.2.0" rxrelay2 = "2.1.0" -savedstate = "1.2.0" -truth = "0.43" +savedstate = "1.2.1" +soloader = "0.10.1" uber-nullaway = "0.9.0" [libraries] @@ -82,6 +77,7 @@ dagger-library = { group = "com.google.dagger", name = "dagger", version.ref = " errorprone-core = { group = "com.google.errorprone", name = "error_prone_core", version.ref = "errorprone" } errorprone-javac = { group = "com.google.errorprone", name = "javac", version.ref = "errorprone-javac" } flipper = { group = "com.facebook.flipper", name = "flipper", version.ref = "flipper" } +flipper-noop = { module = "com.facebook.flipper:flipper-noop", version.ref = "flipper" } gradle-android-plugin = { module = "com.android.tools.build:gradle", version.ref = "gradle-android-plugin" } gradle-errorprone-plugin = { module = "net.ltgt.gradle:gradle-errorprone-plugin", version.ref = "gradle-errorprone-plugin" } gradle-kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } @@ -106,15 +102,16 @@ rxjava2 = { group = "io.reactivex.rxjava2", name = "rxjava", version.ref = "rxja rxkotlin = { group = "io.reactivex.rxjava2", name = "rxkotlin", version.ref = "rxkotlin" } rxrelay2 = { group = "com.jakewharton.rxrelay2", name = "rxrelay", version.ref = "rxrelay2" } savedstate = { group = "androidx.savedstate", name = "savedstate", version.ref = "savedstate" } +soloader = { module = "com.facebook.soloader:soloader", version.ref = "soloader" } uber-nullaway = { group = "com.uber.nullaway", name = "nullaway", version.ref = "uber-nullaway" } [plugins] -androidApplication = { id = "com.android.application", version.ref = "gradle-android-plugin" } -androidLibrary = { id = "com.android.library", version.ref = "gradle-android-plugin" } +android-application = { id = "com.android.application", version.ref = "gradle-android-plugin" } +android-library = { id = "com.android.library", version.ref = "gradle-android-plugin" } errorprone = { id = "net.ltgt.errorprone", version.ref = "gradle-errorprone-plugin" } intellij = { id = "org.jetbrains.intellij", version.ref = "gradle-intellij-plugin" } -kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -kotlinKapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } -mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "gradle-maven-publish-plugin" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } +maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "gradle-maven-publish-plugin" } nullaway = { id = "net.ltgt.nullaway", version.ref = "gradle-nullaway-plugin" } spotless = { id = "com.diffplug.spotless", version.ref = "gradle-spotless-plugin" } diff --git a/android/gradle/test-libs.versions.toml b/android/gradle/test-libs.versions.toml index 0c3d1754c..c0efa0aa8 100644 --- a/android/gradle/test-libs.versions.toml +++ b/android/gradle/test-libs.versions.toml @@ -2,16 +2,14 @@ compile-testing = "0.17" coroutines = "1.7.3" junit = "4.12" -mockito = "4.6.1" mockito-kotlin = "4.0.0" robolectric = "4.4" truth = "0.43" [libraries] -compileTesting = { group = "com.google.testing.compile", name = "compile-testing", version.ref = "compile-testing" } +compile-testing = { group = "com.google.testing.compile", name = "compile-testing", version.ref = "compile-testing" } coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" } junit = { group = "junit", name = "junit", version.ref = "junit" } -mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } -mockitoKotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } +mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockito-kotlin" } robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" } truth = { group = "com.google.truth", name = "truth", version.ref = "truth" } diff --git a/android/libraries/rib-android-compose/build.gradle b/android/libraries/rib-android-compose/build.gradle index c923b5c1d..c444ff3af 100644 --- a/android/libraries/rib-android-compose/build.gradle +++ b/android/libraries/rib-android-compose/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { @@ -35,6 +35,6 @@ dependencies { implementation(libs.compose.foundation) implementation(libs.compose.ui) testImplementation(testLibs.robolectric) - testImplementation(testLibs.mockitoKotlin) + testImplementation(testLibs.mockito.kotlin) testImplementation(project(":libraries:rib-test")) } diff --git a/android/libraries/rib-android-core/build.gradle b/android/libraries/rib-android-core/build.gradle index 2e4cabff9..9b4758341 100644 --- a/android/libraries/rib-android-core/build.gradle +++ b/android/libraries/rib-android-core/build.gradle @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { diff --git a/android/libraries/rib-android/build.gradle.kts b/android/libraries/rib-android/build.gradle.kts index 547fc1231..f81bbfbc7 100644 --- a/android/libraries/rib-android/build.gradle.kts +++ b/android/libraries/rib-android/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { @@ -48,6 +48,6 @@ dependencies { testImplementation(testLibs.robolectric) testImplementation(libs.lifecycle.runtime) testImplementation(libs.appcompat) - testImplementation(testLibs.mockitoKotlin) + testImplementation(testLibs.mockito.kotlin) testImplementation(project(":libraries:rib-test")) } diff --git a/android/libraries/rib-base/build.gradle b/android/libraries/rib-base/build.gradle index fff35d78c..fa6cbfaa7 100644 --- a/android/libraries/rib-base/build.gradle +++ b/android/libraries/rib-base/build.gradle @@ -15,8 +15,8 @@ */ plugins { id("ribs.kotlin-library-conventions") - alias(libs.plugins.kotlinKapt) - alias(libs.plugins.mavenPublish) + alias(libs.plugins.kotlin.kapt) + alias(libs.plugins.maven.publish) } dependencies { @@ -47,9 +47,7 @@ dependencies { testImplementation(project(":libraries:rib-coroutines-test")) testImplementation(libs.annotation) testImplementation(libs.android.api) - testImplementation(testLibs.junit) - testImplementation(testLibs.mockito) - testImplementation(testLibs.mockitoKotlin) + testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.truth) testImplementation(project(":libraries:rib-test")) { transitive = false diff --git a/android/libraries/rib-compiler-app/build.gradle b/android/libraries/rib-compiler-app/build.gradle index 6da04f79a..b7fc1d7a0 100644 --- a/android/libraries/rib-compiler-app/build.gradle +++ b/android/libraries/rib-compiler-app/build.gradle @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } dependencies { @@ -30,7 +30,7 @@ dependencies { compileOnly(libs.autoservice) compileOnly(libs.android.api) - testImplementation(testLibs.compileTesting) + testImplementation(testLibs.compile.testing) } // https://code.google.com/p/android/issues/detail?id=64887 diff --git a/android/libraries/rib-compiler-test/build.gradle b/android/libraries/rib-compiler-test/build.gradle index c9bf2dbd1..23163f44b 100644 --- a/android/libraries/rib-compiler-test/build.gradle +++ b/android/libraries/rib-compiler-test/build.gradle @@ -18,8 +18,8 @@ import org.gradle.internal.jvm.Jvm plugins { id("ribs.kotlin-library-conventions") - alias(libs.plugins.kotlinKapt) - alias(libs.plugins.mavenPublish) + alias(libs.plugins.kotlin.kapt) + alias(libs.plugins.maven.publish) } dependencies { @@ -32,7 +32,7 @@ dependencies { kapt(libs.autoservice) testImplementation(libs.annotation) - testImplementation(testLibs.compileTesting) + testImplementation(testLibs.compile.testing) testImplementation files("libs/tools.jar") } diff --git a/android/libraries/rib-coroutines-test/build.gradle.kts b/android/libraries/rib-coroutines-test/build.gradle.kts index fae9d4842..755d3aa9f 100644 --- a/android/libraries/rib-coroutines-test/build.gradle.kts +++ b/android/libraries/rib-coroutines-test/build.gradle.kts @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } kotlin { @@ -39,8 +39,7 @@ dependencies { testImplementation(project(":libraries:rib-base")) testImplementation(project(":libraries:rib-test")) testImplementation(testLibs.junit) - testImplementation(testLibs.mockito) - testImplementation(testLibs.mockitoKotlin) + testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.truth) testImplementation(testLibs.coroutines.test) testImplementation(libs.coroutines.android) diff --git a/android/libraries/rib-coroutines/build.gradle b/android/libraries/rib-coroutines/build.gradle index a1c457171..8e219c3b3 100644 --- a/android/libraries/rib-coroutines/build.gradle +++ b/android/libraries/rib-coroutines/build.gradle @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } dependencies { @@ -30,8 +30,7 @@ dependencies { testImplementation(project(":libraries:rib-base")) testImplementation(project(":libraries:rib-test")) testImplementation(testLibs.junit) - testImplementation(testLibs.mockito) - testImplementation(testLibs.mockitoKotlin) + testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.truth) testImplementation(testLibs.coroutines.test) testImplementation(libs.annotation) diff --git a/android/libraries/rib-debug-utils/build.gradle.kts b/android/libraries/rib-debug-utils/build.gradle.kts index 1f17e5e49..4e1668147 100644 --- a/android/libraries/rib-debug-utils/build.gradle.kts +++ b/android/libraries/rib-debug-utils/build.gradle.kts @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } kotlin { diff --git a/android/libraries/rib-router-navigator/build.gradle b/android/libraries/rib-router-navigator/build.gradle index 2f2adca0d..13f5d569c 100644 --- a/android/libraries/rib-router-navigator/build.gradle +++ b/android/libraries/rib-router-navigator/build.gradle @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } dependencies { @@ -29,6 +29,6 @@ dependencies { compileOnly(libs.android.api) testImplementation(testLibs.junit) - testImplementation(testLibs.mockitoKotlin) + testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.truth) } diff --git a/android/libraries/rib-screen-stack-base/build.gradle b/android/libraries/rib-screen-stack-base/build.gradle index 4641140e9..a7429649d 100644 --- a/android/libraries/rib-screen-stack-base/build.gradle +++ b/android/libraries/rib-screen-stack-base/build.gradle @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { diff --git a/android/libraries/rib-test/build.gradle.kts b/android/libraries/rib-test/build.gradle.kts index cec95a5ee..e7a22216f 100644 --- a/android/libraries/rib-test/build.gradle.kts +++ b/android/libraries/rib-test/build.gradle.kts @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } kotlin { @@ -32,10 +32,9 @@ kotlin { dependencies { api(project(":libraries:rib-base")) implementation(libs.rxjava2) - implementation(libs.kotlin.stdlib) api(testLibs.junit) api(testLibs.truth) - api(testLibs.mockito) + api(testLibs.mockito.kotlin) api(testLibs.coroutines.test) - implementation(testLibs.mockitoKotlin) + implementation(testLibs.mockito.kotlin) } diff --git a/android/libraries/rib-workflow-test/build.gradle.kts b/android/libraries/rib-workflow-test/build.gradle.kts index 312d5de7c..a2992d790 100644 --- a/android/libraries/rib-workflow-test/build.gradle.kts +++ b/android/libraries/rib-workflow-test/build.gradle.kts @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { diff --git a/android/libraries/rib-workflow/build.gradle b/android/libraries/rib-workflow/build.gradle index e0b5910c2..12020f04d 100644 --- a/android/libraries/rib-workflow/build.gradle +++ b/android/libraries/rib-workflow/build.gradle @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { @@ -32,5 +32,5 @@ dependencies { api(project(":libraries:rib-android")) testImplementation(testLibs.junit) testImplementation(testLibs.truth) - testImplementation(testLibs.mockito) + testImplementation(testLibs.mockito.kotlin) } diff --git a/android/tooling/rib-flipper-plugin/build.gradle b/android/tooling/rib-flipper-plugin/build.gradle index 687eee600..5a47998b6 100644 --- a/android/tooling/rib-flipper-plugin/build.gradle +++ b/android/tooling/rib-flipper-plugin/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { diff --git a/android/tooling/rib-intellij-plugin/build.gradle b/android/tooling/rib-intellij-plugin/build.gradle index 4fcd9734a..077aca802 100644 --- a/android/tooling/rib-intellij-plugin/build.gradle +++ b/android/tooling/rib-intellij-plugin/build.gradle @@ -33,26 +33,15 @@ dependencies { testImplementation(libs.javax.inject) testImplementation(libs.dagger.library) testImplementation(testLibs.truth) - testImplementation(testLibs.compileTesting) - testImplementation(testLibs.mockito) + testImplementation(testLibs.compile.testing) + testImplementation(testLibs.mockito.kotlin) testImplementation(libs.annotation) testImplementation(libs.android.api) } -// Determines if the machine has Maven credentials. -def hasMavenCredentials() { - return ext.mavenUser && ext.mavenPassword -} - -// Determines if it is a release build. -def isReleaseBuild() { - return System.env.ENABLE_RELEASE_BUILD.equals("true") -} - ext.pluginXml = new XmlSlurper().parse(file("src/main/resources/META-INF/plugin.xml")) version = pluginXml.version - task sourcesJar(type: Jar, dependsOn: classes) { archiveClassifier = "sources" from sourceSets.main.allSource diff --git a/android/tooling/rib-intellij-plugin/native/intellij-broadcast-rib/build.gradle b/android/tooling/rib-intellij-plugin/native/intellij-broadcast-rib/build.gradle index 84034ec23..7ee66ec41 100644 --- a/android/tooling/rib-intellij-plugin/native/intellij-broadcast-rib/build.gradle +++ b/android/tooling/rib-intellij-plugin/native/intellij-broadcast-rib/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { diff --git a/android/tooling/utils/intellij-broadcast-core/build.gradle b/android/tooling/utils/intellij-broadcast-core/build.gradle index ddb95555d..34965eb0f 100644 --- a/android/tooling/utils/intellij-broadcast-core/build.gradle +++ b/android/tooling/utils/intellij-broadcast-core/build.gradle @@ -16,7 +16,7 @@ plugins { id("ribs.kotlin-android-library-conventions") - alias(libs.plugins.mavenPublish) + alias(libs.plugins.maven.publish) } android { diff --git a/android/tutorials/tutorial3-completed/build.gradle b/android/tutorials/tutorial3-completed/build.gradle index e6fcb60bb..815f6a979 100644 --- a/android/tutorials/tutorial3-completed/build.gradle +++ b/android/tutorials/tutorial3-completed/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-application-conventions") - alias(libs.plugins.kotlinKapt) + alias(libs.plugins.kotlin.kapt) } android { diff --git a/android/tutorials/tutorial3/build.gradle b/android/tutorials/tutorial3/build.gradle index 7c98c5d3a..4cd078ea6 100644 --- a/android/tutorials/tutorial3/build.gradle +++ b/android/tutorials/tutorial3/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-application-conventions") - alias(libs.plugins.kotlinKapt) + alias(libs.plugins.kotlin.kapt) } android { diff --git a/android/tutorials/tutorial4/build.gradle b/android/tutorials/tutorial4/build.gradle index e5e6f4b4b..218dd768b 100644 --- a/android/tutorials/tutorial4/build.gradle +++ b/android/tutorials/tutorial4/build.gradle @@ -15,7 +15,7 @@ */ plugins { id("ribs.kotlin-android-application-conventions") - alias(libs.plugins.kotlinKapt) + alias(libs.plugins.kotlin.kapt) } android {