Dependency management

Author: nhaarman

.ops/pitest.gradle

@@ -4,12 +4,12 @@ if (!hasAndroid && project.name != "ext-acorn-android-lint") {
     project.apply plugin: "info.solidsoft.pitest"
 
     project.dependencies {
-        pitest("org.pitest:pitest-junit5-plugin:0.14")
+        pitest(libs.pitest.junit5)
     }
 
     pitest {
         targetClasses = ["com.*", "acorn.*"]
-        pitestVersion = "1.4.9"
+        pitestVersion = libs.versions.pitest.core.get()
         testPlugin = "junit5"
         threads = 4
         outputFormats = ["XML", "HTML"]

.ops/publishing.gradle

@@ -151,14 +151,7 @@ publishing {
 
 // Configure signing (only if keys are available)
 signing {
-    def signingKey = findProperty("signingKey") ?: System.getenv("SIGNING_KEY")
-    def signingPassword = findProperty("signingPassword") ?: System.getenv("SIGNING_PASSWORD")
-
-    if (signingKey && signingPassword) {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign publishing.publications
-    } else if (findProperty("signing.secretKeyRingFile") || findProperty("signing.keyId")) {
-        // Fall back to Gradle's default signing properties if configured via file-based keys
+    if (findProperty("signing.secretKeyRingFile") || findProperty("signing.keyId")) {
         sign publishing.publications
     } else {
         logger.lifecycle("[publishing] Signing is not configured; publications will not be signed.")

build.gradle

@@ -1,29 +1,33 @@
 buildscript {
-    ext.kotlinVersion = "2.2.20"
+    // Kotlin version managed via version catalog
+    ext.kotlinVersion = libs.versions.kotlin.plugin.get()
 
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.13.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.13.4.0")
-        classpath("com.adarshr:gradle-test-logger-plugin:4.0.0")
-        classpath("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0")
+        classpath("com.android.tools.build:gradle:${libs.versions.android.gradle.get()}")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.plugin.get()}")
+        classpath("de.mannodermaus.gradle.plugins:android-junit5:${libs.versions.android.junit5.plugin.get()}")
+        classpath("com.adarshr:gradle-test-logger-plugin:${libs.versions.test.logger.plugin.get()}")
+        classpath("info.solidsoft.gradle.pitest:gradle-pitest-plugin:${libs.versions.gradle.pitest.plugin.get()}")
     }
 }
 
 plugins {
-    id("com.github.ben-manes.versions") version "0.52.0"
-    id("io.spring.dependency-management") version "1.1.7"
+    alias(libs.plugins.ben.manes.versions)
+}
+
+def suppliedVersion = project.findProperty("versionName") ?: project.findProperty("version")
+if (!suppliedVersion) {
+    throw new GradleException("Missing required project property: versionName (or version). Pass with -PversionName=1.2.3")
 }
 
 allprojects {
-    apply from: "$rootDir/.ops/git.gradle"
-    // Use git-based versioning for all modules
-    version = git.versionName()
+    // Use parameter-based versioning for all modules
+    version = suppliedVersion
 }
 
 subprojects {
@@ -32,7 +36,6 @@ subprojects {
         mavenCentral()
     }
 
-    project.apply from: "$rootDir/dependencies.gradle"
 
     afterEvaluate { project ->
         tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
@@ -72,8 +75,8 @@ subprojects {
                 defaultConfig {
                     targetSdkVersion(36)
 
-                    versionName = git.versionName()
-                    versionCode = git.commitCount()
+                    versionName = suppliedVersion
+                    versionCode = (project.findProperty("versionCode") ?: 1) as int
 
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 }
@@ -105,4 +108,31 @@ subprojects {
     }
 }
 
-println("Version ${git.versionName()}")
+println("Version ${project.version}")
+
+allprojects { project ->
+    project.configurations.all {
+        resolutionStrategy {
+            eachDependency { dependency ->
+                if (dependency.requested.name in ["kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8", "kotlin-reflect"]) {
+                    dependency.useVersion(kotlinVersion)
+                }
+            }
+            // Ensure consistent resolution of androidx.annotation across configurations
+            force "androidx.annotation:annotation:${libs.versions.androidx.annotation.get()}"
+        }
+    }
+}
+
+rootProject.dependencyUpdates.resolutionStrategy {
+    componentSelection { rules ->
+        rules.all { ComponentSelection selection ->
+            boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'preview'].any { qualifier ->
+                selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
+            }
+            if (rejected) {
+                selection.reject('Release candidate')
+            }
+        }
+    }
+}

core/acorn-core/build.gradle

@@ -17,10 +17,10 @@ compileKotlin {
 }
 
 dependencies {
-    compileOnly "androidx.annotation:annotation"
+    compileOnly libs.androidx.annotation
 
-    testImplementation "org.mockito.kotlin:mockito-kotlin"
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.expectkt
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.engine
 }

dependencies.gradle

@@ -19,7 +19,7 @@ repositories {
 orchid {
     theme = "Editorial"
     baseUrl = "https://nhaarman.github.io/acorn"
-    version = git.versionName()
+    version = project.rootProject.version.toString()
 
     githubToken = "${System.getenv('GITHUB_TOKEN')}"
 }

docs/build.gradle

@@ -29,13 +29,12 @@ android {
 dependencies {
     api project(':ext-acorn-android')
 
-    api "androidx.appcompat:appcompat"
+    api libs.androidx.appcompat
 
+    compileOnly libs.androidx.annotation
 
-    compileOnly "androidx.annotation:annotation"
-
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.mockito.kotlin:mockito-kotlin"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testRuntimeOnly libs.junit.jupiter.engine
 }

ext/acorn-android/acorn-android-appcompat/build.gradle

@@ -29,20 +29,19 @@ android {
 dependencies {
     api project(':ext-acorn')
 
-    api "androidx.lifecycle:lifecycle-runtime"
+    api libs.androidx.lifecycle.runtime
 
+    compileOnly libs.androidx.annotation
 
-    compileOnly "androidx.annotation:annotation"
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testRuntimeOnly libs.junit.jupiter.engine
 
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.mockito.kotlin:mockito-kotlin"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
-
-    androidTestImplementation "junit:junit"
-    androidTestImplementation "com.nhaarman:expect.kt"
-    androidTestImplementation "androidx.test.espresso:espresso-core"
-    androidTestImplementation "androidx.test.espresso:espresso-contrib"
-    androidTestImplementation "androidx.test:runner"
-    androidTestImplementation "androidx.test:rules"
+    androidTestImplementation libs.junit4
+    androidTestImplementation libs.expectkt
+    androidTestImplementation libs.androidx.espresso.core
+    androidTestImplementation libs.androidx.espresso.contrib
+    androidTestImplementation libs.androidx.test.runner
+    androidTestImplementation libs.androidx.test.rules
 }

ext/acorn-android/acorn-android-lifecycle/build.gradle

@@ -14,13 +14,13 @@ compileKotlin {
 }
 
 dependencies {
-    compileOnly "com.android.tools.lint:lint-api"
-    compileOnly "com.android.tools.lint:lint-checks"
+    compileOnly libs.android.lint.api
+    compileOnly libs.android.lint.checks
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine"
-    testImplementation "com.android.tools.lint:lint"
-    testImplementation "com.android.tools.lint:lint-tests"
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.engine
+    testImplementation libs.android.lint
+    testImplementation libs.android.lint.tests
 }
 
 jar {

ext/acorn-android/acorn-android-lint/build.gradle

@@ -29,11 +29,10 @@ android {
 dependencies {
     api project(':ext-acorn-android')
 
+    compileOnly libs.androidx.annotation
 
-    compileOnly "androidx.annotation:annotation"
-
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.mockito.kotlin:mockito-kotlin"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testRuntimeOnly libs.junit.jupiter.engine
 }