diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 7ba90982..19c5d8f5 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -21,6 +21,15 @@ jobs:
           distribution: 'zulu'
           java-version: '17'
 
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: Install Android SDK components
+        run: |
+          echo "sdk.dir=$ANDROID_SDK_ROOT" > local.properties
+          sdkmanager --install "platform-tools" "platforms;android-34" "build-tools;34.0.0"
+          yes | sdkmanager --licenses
+
       - name: ktlint
         run: bash ./ktlint "**/src/**/*.kt" --color
 
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index f83279ab..403b2389 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,6 +2,41 @@
   <code_scheme name="Project" version="173">
     <option name="RIGHT_MARGIN" value="180" />
     <option name="SOFT_MARGINS" value="120,180" />
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 494e763a..5567262e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,7 +12,7 @@
     </option>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.ops/pitest.gradle b/.ops/pitest.gradle
index c85cf4fa..6c12db8e 100644
--- a/.ops/pitest.gradle
+++ b/.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"]
diff --git a/.ops/publishing-android.gradle b/.ops/publishing-android.gradle
deleted file mode 100644
index 9af2bc5d..00000000
--- a/.ops/publishing-android.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-apply plugin: "maven-publish"
-
-apply from: "$rootDir/.ops/publishing-base.gradle"
-
-//task sourcesJar(type: Jar) {
-//    archiveClassifier.set('sources')
-//    from android.sourceSets.main.java.srcDirs
-//}
-
-afterEvaluate {
-    publishing {
-        publications {
-            maven(MavenPublication) {
-                from components.release
-
-//                artifact sourcesJar
-            }
-        }
-    }
-}
diff --git a/.ops/publishing-base.gradle b/.ops/publishing-base.gradle
deleted file mode 100644
index ae2fb105..00000000
--- a/.ops/publishing-base.gradle
+++ /dev/null
@@ -1,82 +0,0 @@
-publishing {
-    def sonatype_username = "${findProperty('sonatype_username') ?: System.getenv("sonatype_username")}"
-    def sonatype_password = "${findProperty('sonatype_password') ?: System.getenv("sonatype_password")}"
-
-    repositories {
-        maven {
-            name = "Sonatype"
-            setUrl("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-            credentials {
-                username = sonatype_username
-                password = sonatype_password
-            }
-        }
-
-        maven {
-            name = "SonatypeSnapshots"
-            setUrl("https://oss.sonatype.org/content/repositories/snapshots/")
-            credentials {
-                username = sonatype_username
-                password = sonatype_password
-            }
-        }
-    }
-
-    publications {
-        maven(MavenPublication) {
-            versionMapping {
-                usage("java-api") {
-                    fromResolutionResult()
-                }
-                usage("java-runtime") {
-                    fromResolutionResult()
-                }
-            }
-
-            version = git.versionName()
-
-            groupId = project.getProperty("groupId")
-            artifactId = project.getProperty("artifactId")
-
-            pom {
-                name = "Acorn"
-                description = "Mastering Android Navigation"
-                url = "https://github.com/nhaarman/Acorn"
-                licenses {
-                    license {
-                        name = "Apache License 2.0"
-                        url = "http://www.apache.org/licenses/LICENSE-2.0"
-                    }
-                }
-
-                developers {
-                    developer {
-                        id = "nhaarman"
-                        name = "Niek Haarman"
-                    }
-                }
-
-                scm {
-                    connection = 'scm:git@github.com:nhaarman/Acorn.git'
-                    developerConnection = 'scm:git@github.com:nhaarman/Acorn.git'
-                    url = 'https://github.com/nhaarman/Acorn'
-                }
-            }
-        }
-    }
-}
-
-tasks.withType(PublishToMavenRepository).configureEach {
-    onlyIf {
-        git.versionName().contains("SNAPSHOT") && repository == publishing.repositories["SonatypeSnapshots"] ||
-                !git.versionName().contains("SNAPSHOT") && repository == publishing.repositories["Sonatype"]
-    }
-}
-
-signing {
-    if (findProperty("signing.keyId") != null) {
-        sign(publishing.publications["maven"])
-    } else {
-        println "No signing keyId found, skipping signing."
-    }
-}
\ No newline at end of file
diff --git a/.ops/publishing-kotlin.gradle b/.ops/publishing-kotlin.gradle
deleted file mode 100644
index 122ff95b..00000000
--- a/.ops/publishing-kotlin.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-apply plugin: "maven-publish"
-
-apply from: "$rootDir/.ops/publishing-base.gradle"
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from(components.java)
-        }
-    }
-}
diff --git a/.ops/publishing.gradle b/.ops/publishing.gradle
new file mode 100644
index 00000000..9e579329
--- /dev/null
+++ b/.ops/publishing.gradle
@@ -0,0 +1,159 @@
+// Shared Maven Central publishing configuration for Acorn
+// Applies to subprojects that define `groupId` and `artifactId` in their gradle.properties.
+
+ext.isAndroidLibrary = { project.plugins.hasPlugin("com.android.library") }
+ext.isJvmLibrary = { project.plugins.hasPlugin("org.gradle.java-library") || project.plugins.hasPlugin("org.jetbrains.kotlin.jvm") }
+
+// Apply plugins if not already applied
+plugins.withId("org.gradle.maven-publish") {}
+if (!plugins.hasPlugin("org.gradle.maven-publish")) {
+    apply plugin: "maven-publish"
+}
+if (!plugins.hasPlugin("signing")) {
+    apply plugin: "signing"
+}
+
+// Set group and artifact from module gradle.properties
+if (project.hasProperty("groupId")) {
+    group = project.property("groupId")
+}
+
+// Ensure sources and javadoc artifacts exist
+if (isJvmLibrary()) {
+    // Ensure Java convention is present to register sources/javadoc jars
+    plugins.withId("org.gradle.java") {
+        java {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+    plugins.withId("org.gradle.java-library") {
+        java {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+}
+
+// For Android libraries, use AGP's publishing DSL to configure the release variant with sources
+plugins.withId("com.android.library") {
+    android {
+        publishing {
+            singleVariant("release") {
+                withSourcesJar()
+            }
+        }
+    }
+
+    // Provide a minimal javadoc jar to satisfy Maven Central requirements
+    // This creates an empty javadoc jar, which is acceptable for Android/Kotlin libraries
+    tasks.register("androidJavadocJar", Jar) {
+        archiveClassifier.set("javadoc")
+    }
+}
+
+publishing {
+    publications {
+        def pub = publications.findByName("maven") as MavenPublication
+        if (pub == null) {
+            maven(MavenPublication) {
+                if (isAndroidLibrary()) {
+                    // Publish the release variant for Android libraries
+                    afterEvaluate {
+                        from components.findByName("release")
+                    }
+                    // Sources are added via AGP publishing DSL (singleVariant + withSourcesJar)
+                    // Provide a minimal javadoc jar as required by Maven Central
+                    artifact tasks.named("androidJavadocJar")
+                } else {
+                    // JVM libraries
+                    if (components.findByName("java") != null) {
+                        from components.java
+                    }
+                }
+
+                if (project.hasProperty("artifactId")) {
+                    artifactId = project.property("artifactId")
+                }
+
+                pom {
+                    name = "Acorn"
+                    description = "Mastering Android Navigation"
+                    url = "https://github.com/nhaarman/Acorn"
+
+                    licenses {
+                        license {
+                            name = "The Apache License, Version 2.0"
+                            url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+                            distribution = "repo"
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id = "nhaarman"
+                            name = "Niek Haarman"
+                        }
+                    }
+
+                    scm {
+                        url = "https://github.com/nhaarman/Acorn"
+                        connection = "scm:git:git://github.com/nhaarman/Acorn.git"
+                        developerConnection = "scm:git:ssh://github.com/nhaarman/Acorn.git"
+                    }
+                }
+            }
+        }
+    }
+
+    repositories {
+        // Prefer Central Publishing Portal if configured; otherwise fall back to OSSRH
+        def isSnapshot = project.version?.toString()?.endsWith("-SNAPSHOT")
+        def useCentral = (findProperty("centralPortal")?.toString()?.toBoolean() ?: false)
+                || (System.getenv("CENTRAL_PORTAL")?.toBoolean() ?: false)
+
+        if (useCentral) {
+            if (isSnapshot) {
+                throw new GradleException("Central Publishing Portal does not accept SNAPSHOT versions. Remove -SNAPSHOT or disable centralPortal.")
+            }
+            maven {
+                name = "CentralPortal"
+                def centralUrl = findProperty("centralPortalUrl") ?: System.getenv("CENTRAL_PORTAL_URL")
+                if (!centralUrl) {
+                    // Default upload endpoint for Central Portal (token-based)
+                    centralUrl = "https://central.sonatype.com/api/v1/publisher/deploy/maven2"
+                }
+                url = uri(centralUrl)
+                credentials {
+                    username = findProperty("centralPortalUsername") ?: System.getenv("CENTRAL_PORTAL_USERNAME")
+                    password = findProperty("centralPortalPassword") ?: System.getenv("CENTRAL_PORTAL_PASSWORD")
+                }
+            }
+        } else {
+            // Legacy OSSRH repositories for releases and snapshots
+            maven {
+                name = "OSSRH"
+                def releasesUrl = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
+                def snapshotsUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+                url = isSnapshot ? snapshotsUrl : releasesUrl
+
+                credentials {
+                    // Support multiple property names and environment variables
+                    username = findProperty("ossrhUsername") ?: findProperty("mavenCentralUsername")
+                            ?: System.getenv("OSSRH_USERNAME") ?: System.getenv("MAVEN_CENTRAL_USERNAME")
+                    password = findProperty("ossrhPassword") ?: findProperty("mavenCentralPassword")
+                            ?: System.getenv("OSSRH_PASSWORD") ?: System.getenv("MAVEN_CENTRAL_PASSWORD")
+                }
+            }
+        }
+    }
+}
+
+// Configure signing (only if keys are available)
+signing {
+    if (findProperty("signing.secretKeyRingFile") || findProperty("signing.keyId")) {
+        sign publishing.publications
+    } else {
+        logger.lifecycle("[publishing] Signing is not configured; publications will not be signed.")
+    }
+}
diff --git a/build.gradle b/build.gradle
index cdec0d73..e17bc267 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 buildscript {
-    ext.kotlinVersion = "1.8.21"
+    // Kotlin version managed via version catalog
+    ext.kotlinVersion = libs.versions.kotlin.plugin.get()
 
     repositories {
         google()
@@ -7,37 +8,41 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.0.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.9.3.0")
-        classpath("com.adarshr:gradle-test-logger-plugin:3.2.0")
-        classpath("digital.wup:android-maven-publish:3.6.3")
-        classpath("info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.11")
+        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.46.0"
-    id("io.spring.dependency-management") version "1.0.8.RELEASE"
+    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 parameter-based versioning for all modules
+    version = suppliedVersion
 }
 
 subprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
 
-    project.apply from: "$rootDir/dependencies.gradle"
 
     afterEvaluate { project ->
         tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
             kotlinOptions {
                 freeCompilerArgs += ["-progressive"]
+                // Ensure all Kotlin compile tasks (including tests) target JVM 17
+                jvmTarget = "17"
             }
         }
 
@@ -66,12 +71,12 @@ subprojects {
                     targetCompatibility JavaVersion.VERSION_17
                 }
 
-                compileSdkVersion(33)
+                compileSdkVersion(36)
                 defaultConfig {
-                    targetSdkVersion(33)
+                    targetSdkVersion(36)
 
-                    versionName = git.versionName()
-                    versionCode = git.commitCount()
+                    versionName = suppliedVersion
+                    versionCode = (project.findProperty("versionCode") ?: 1) as int
 
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 }
@@ -89,25 +94,45 @@ subprojects {
                     ignore "ObsoleteLintCustomCheck", "GradleDependency"
                 }
             }
-
-            if (project.hasProperty("publishing")) {
-                project.apply from: "$rootDir/.ops/publishing-android.gradle"
-            }
-        } else {
-            if (project.hasProperty("publishing")) {
-                project.apply from: "$rootDir/.ops/publishing-kotlin.gradle"
-            }
         }
 
         if (project.name != "docs" && (project.hasProperty("test") || project.hasProperty("android"))) {
             project.apply from: "$rootDir/.ops/testing.gradle"
             project.apply from: "$rootDir/.ops/pitest.gradle"
         }
+
+        // Apply publishing configuration for modules that define Maven coordinates
+        if (project.hasProperty("groupId") && project.hasProperty("artifactId")) {
+            project.apply from: "$rootDir/.ops/publishing.gradle"
+        }
     }
 }
 
-task clean(type: Delete) {
-    delete(rootProject.buildDir)
+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()}"
+        }
+    }
 }
 
-println("Version ${git.versionName()}")
+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')
+            }
+        }
+    }
+}
diff --git a/core/acorn-android-core/build.gradle b/core/acorn-android-core/build.gradle
index 04dc55f3..e096b3b4 100644
--- a/core/acorn-android-core/build.gradle
+++ b/core/acorn-android-core/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
 
-    id("digital.wup.android-maven-publish")
     id("signing")
 }
 
diff --git a/core/acorn-core/build.gradle b/core/acorn-core/build.gradle
index e336cac5..ca0771ec 100644
--- a/core/acorn-core/build.gradle
+++ b/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
 }
\ No newline at end of file
diff --git a/dependencies.gradle b/dependencies.gradle
deleted file mode 100644
index 94a0a82c..00000000
--- a/dependencies.gradle
+++ /dev/null
@@ -1,83 +0,0 @@
-apply plugin: "io.spring.dependency-management"
-
-dependencyManagement {
-    dependencies {
-        dependency "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-
-        // core dependencies
-        dependency "androidx.annotation:annotation:1.6.0"
-
-        // ext-acorn-android
-        dependency "androidx.appcompat:appcompat:1.6.1"
-        dependency "androidx.interpolator:interpolator:1.0.0"
-
-        // ext-acorn-rx
-        dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-        dependency "io.reactivex.rxjava2:rxkotlin:2.4.0"
-
-        // ext-acorn-android-timber
-        dependency "com.jakewharton.timber:timber:5.0.1"
-
-        // ext-acorn-android-lifecycle
-        dependency "androidx.lifecycle:lifecycle-runtime:2.6.1"
-
-
-        // "Hello"-sample apps
-        dependency "androidx.core:core-ktx:1.10.0"
-        dependency "com.google.android.material:material:1.8.0"
-        dependency "androidx.constraintlayout:constraintlayout:2.1.4"
-        dependency "io.reactivex.rxjava2:rxandroid:2.1.1"
-        dependency "com.squareup.picasso:picasso:2.71828"
-        dependency "nl.dionsegijn:konfetti:1.3.2"
-
-        // Notes app
-        dependency "com.jakewharton.rxbinding3:rxbinding:3.1.0"
-        dependency "com.jakewharton.rxbinding3:rxbinding-appcompat:3.1.0"
-        dependency "com.squareup.sqlbrite3:sqlbrite-kotlin:3.2.0"
-        dependency "android.arch.persistence:db-framework:1.1.1"
-
-
-        // Testing & checks
-        dependency "com.nhaarman:expect.kt:1.0.1"
-        dependency "org.mockito.kotlin:mockito-kotlin:4.1.0"
-        dependency "org.junit.jupiter:junit-jupiter-api:5.9.3"
-        dependency "org.junit.jupiter:junit-jupiter-engine:5.9.3"
-
-        dependency "androidx.test.espresso:espresso-core:3.5.1"
-        dependency "androidx.test.espresso:espresso-contrib:3.5.1"
-        dependency "androidx.test:runner:1.5.2"
-        dependency "androidx.test:rules:1.5.0"
-        dependency "androidx.test.uiautomator:uiautomator:2.2.0"
-
-        def androidToolsVersion = "30.0.1"
-        dependency "com.android.tools.lint:lint:$androidToolsVersion"
-        dependency "com.android.tools.lint:lint-api:$androidToolsVersion"
-        dependency "com.android.tools.lint:lint-checks:$androidToolsVersion"
-        dependency "com.android.tools.lint:lint-tests:$androidToolsVersion"
-    }
-}
-
-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)
-                }
-            }
-        }
-    }
-}
-
-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')
-            }
-        }
-    }
-}
diff --git a/docs/build.gradle b/docs/build.gradle
index d495a70a..c4650aa5 100644
--- a/docs/build.gradle
+++ b/docs/build.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')}"
 }
diff --git a/ext/acorn-android/acorn-android-appcompat/build.gradle b/ext/acorn-android/acorn-android-appcompat/build.gradle
index 6cdcbf00..a98478c5 100644
--- a/ext/acorn-android/acorn-android-appcompat/build.gradle
+++ b/ext/acorn-android/acorn-android-appcompat/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
 
-    id("digital.wup.android-maven-publish")
     id("signing")
 }
 
@@ -30,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
 }
diff --git a/ext/acorn-android/acorn-android-appcompat/src/main/java/com/nhaarman/acorn/android/AcornAppCompatActivity.kt b/ext/acorn-android/acorn-android-appcompat/src/main/java/com/nhaarman/acorn/android/AcornAppCompatActivity.kt
index 9316a15b..19633ffa 100644
--- a/ext/acorn-android/acorn-android-appcompat/src/main/java/com/nhaarman/acorn/android/AcornAppCompatActivity.kt
+++ b/ext/acorn-android/acorn-android-appcompat/src/main/java/com/nhaarman/acorn/android/AcornAppCompatActivity.kt
@@ -18,9 +18,12 @@ package com.nhaarman.acorn.android
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import android.window.OnBackInvokedDispatcher
+import androidx.activity.OnBackPressedCallback
 import androidx.annotation.CallSuper
 import androidx.appcompat.app.AppCompatActivity
 import com.nhaarman.acorn.android.navigation.NavigatorProvider
@@ -164,6 +167,31 @@ abstract class AcornAppCompatActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         acornDelegate.onCreate(savedInstanceState)
+
+        // Handle back navigation for Android 13+ (API 33+)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            onBackInvokedDispatcher.registerOnBackInvokedCallback(
+                OnBackInvokedDispatcher.PRIORITY_DEFAULT,
+            ) {
+                acornDelegate.onBackPressed()
+            }
+        }
+
+        // Handle back navigation for older Android versions using OnBackPressedDispatcher
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    if (acornDelegate.onBackPressed()) {
+                        return
+                    }
+
+                    isEnabled = false
+                    onBackPressedDispatcher.onBackPressed()
+                    isEnabled = true
+                }
+            },
+        )
     }
 
     @CallSuper
@@ -178,6 +206,8 @@ abstract class AcornAppCompatActivity : AppCompatActivity() {
         acornDelegate.onActivityResult(requestCode, resultCode, data)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION", "DEPRECATION")
+    @SuppressLint("GestureBackNavigation")
     @CallSuper
     override fun onBackPressed() {
         if (!acornDelegate.onBackPressed()) {
diff --git a/ext/acorn-android/acorn-android-lifecycle/build.gradle b/ext/acorn-android/acorn-android-lifecycle/build.gradle
index c02e6a5c..89d519bd 100644
--- a/ext/acorn-android/acorn-android-lifecycle/build.gradle
+++ b/ext/acorn-android/acorn-android-lifecycle/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
 
-    id("digital.wup.android-maven-publish")
     id("signing")
 }
 
@@ -30,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
 }
diff --git a/ext/acorn-android/acorn-android-lint/build.gradle b/ext/acorn-android/acorn-android-lint/build.gradle
index 802fc468..48cebdbd 100644
--- a/ext/acorn-android/acorn-android-lint/build.gradle
+++ b/ext/acorn-android/acorn-android-lint/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 {
diff --git a/ext/acorn-android/acorn-android-statechecks/build.gradle b/ext/acorn-android/acorn-android-statechecks/build.gradle
index 552bd25b..2ff2c739 100644
--- a/ext/acorn-android/acorn-android-statechecks/build.gradle
+++ b/ext/acorn-android/acorn-android-statechecks/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
 
-    id("digital.wup.android-maven-publish")
     id("signing")
 }
 
@@ -30,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
 }
diff --git a/ext/acorn-android/acorn-android-testing/build.gradle b/ext/acorn-android/acorn-android-testing/build.gradle
index b1007486..92f41662 100644
--- a/ext/acorn-android/acorn-android-testing/build.gradle
+++ b/ext/acorn-android/acorn-android-testing/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
 
-    id("digital.wup.android-maven-publish")
     id("signing")
 }
 
@@ -30,6 +29,5 @@ android {
 dependencies {
     api project(":ext-acorn-android")
 
-
-    compileOnly "androidx.test:rules"
+    compileOnly libs.androidx.test.rules
 }
diff --git a/ext/acorn-android/acorn-android-timber/build.gradle b/ext/acorn-android/acorn-android-timber/build.gradle
index 2c6cafaf..76e62fec 100644
--- a/ext/acorn-android/acorn-android-timber/build.gradle
+++ b/ext/acorn-android/acorn-android-timber/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
 
-    id("digital.wup.android-maven-publish")
     id("signing")
 }
 
@@ -31,5 +30,5 @@ dependencies {
     api project(":ext-acorn")
 
 
-    implementation "com.jakewharton.timber:timber"
+    implementation libs.timber
 }
diff --git a/ext/acorn-android/build.gradle b/ext/acorn-android/build.gradle
index 6d7e0a27..7f314eba 100644
--- a/ext/acorn-android/build.gradle
+++ b/ext/acorn-android/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id("com.android.library")
     id("kotlin-android")
 
-    id("digital.wup.android-maven-publish")
     id("signing")
 }
 
@@ -32,24 +31,23 @@ dependencies {
     api project(":ext-acorn")
     api project(":acorn-android")
 
-    
-    implementation "androidx.interpolator:interpolator"
+    implementation libs.androidx.interpolator
 
-    compileOnly "androidx.annotation:annotation"
+    compileOnly libs.androidx.annotation
 
     lintChecks project(":ext-acorn-android-lint")
 
-    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"
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testRuntimeOnly libs.junit.jupiter.engine
+
+    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
 }
 
 defaultTasks 'assemble'
diff --git a/ext/acorn-android/src/main/java/com/nhaarman/acorn/android/AcornActivity.kt b/ext/acorn-android/src/main/java/com/nhaarman/acorn/android/AcornActivity.kt
index 9b352277..e81c8217 100644
--- a/ext/acorn-android/src/main/java/com/nhaarman/acorn/android/AcornActivity.kt
+++ b/ext/acorn-android/src/main/java/com/nhaarman/acorn/android/AcornActivity.kt
@@ -16,10 +16,13 @@
 
 package com.nhaarman.acorn.android
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.ViewGroup
+import android.window.OnBackInvokedDispatcher
 import androidx.annotation.CallSuper
 import com.nhaarman.acorn.android.navigation.NavigatorProvider
 import com.nhaarman.acorn.android.presentation.ActivityController
@@ -162,6 +165,15 @@ abstract class AcornActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         acornDelegate.onCreate(savedInstanceState)
+
+        // Handle back navigation for Android 13+ (API 33+)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            onBackInvokedDispatcher.registerOnBackInvokedCallback(
+                OnBackInvokedDispatcher.PRIORITY_DEFAULT,
+            ) {
+                acornDelegate.onBackPressed()
+            }
+        }
     }
 
     @CallSuper
@@ -175,6 +187,8 @@ abstract class AcornActivity : Activity() {
         acornDelegate.onActivityResult(requestCode, resultCode, data)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION", "DEPRECATION")
+    @SuppressLint("GestureBackNavigation")
     @CallSuper
     override fun onBackPressed() {
         if (!acornDelegate.onBackPressed()) {
diff --git a/ext/acorn/acorn-experimental/build.gradle b/ext/acorn/acorn-experimental/build.gradle
index 80884164..1ee2428e 100644
--- a/ext/acorn/acorn-experimental/build.gradle
+++ b/ext/acorn/acorn-experimental/build.gradle
@@ -20,11 +20,10 @@ dependencies {
     api project(":acorn")
     api project(":ext-acorn")
 
-    
-    compileOnly "androidx.annotation:annotation"
+    compileOnly libs.androidx.annotation
 
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.mockito.kotlin:mockito-kotlin"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.engine
 }
diff --git a/ext/acorn/acorn-rx/build.gradle b/ext/acorn/acorn-rx/build.gradle
index 8c61e452..4ddde444 100644
--- a/ext/acorn/acorn-rx/build.gradle
+++ b/ext/acorn/acorn-rx/build.gradle
@@ -19,14 +19,13 @@ compileKotlin {
 dependencies {
     api project(':ext-acorn')
 
-    api "io.reactivex.rxjava2:rxjava"
+    api libs.rxjava2
+    implementation libs.rxkotlin2
 
-        implementation "io.reactivex.rxjava2:rxkotlin"
+    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"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.engine
 }
diff --git a/ext/acorn/acorn-testing/build.gradle b/ext/acorn/acorn-testing/build.gradle
index 5aa31b22..ea73db5f 100644
--- a/ext/acorn/acorn-testing/build.gradle
+++ b/ext/acorn/acorn-testing/build.gradle
@@ -19,5 +19,5 @@ compileKotlin {
 dependencies {
     api project(':ext-acorn')
 
-    compileOnly "androidx.annotation:annotation"
+    compileOnly libs.androidx.annotation
 }
diff --git a/ext/acorn/build.gradle b/ext/acorn/build.gradle
index 9ed93bfe..4d7dfedf 100644
--- a/ext/acorn/build.gradle
+++ b/ext/acorn/build.gradle
@@ -20,11 +20,10 @@ compileKotlin {
 dependencies {
     api project(":acorn")
 
-    
-    compileOnly "androidx.annotation:annotation"
+    compileOnly libs.androidx.annotation
 
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.mockito.kotlin:mockito-kotlin"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.engine
 }
diff --git a/ext/acorn/integrationtests/build.gradle b/ext/acorn/integrationtests/build.gradle
index c296395e..d8fdb490 100644
--- a/ext/acorn/integrationtests/build.gradle
+++ b/ext/acorn/integrationtests/build.gradle
@@ -15,8 +15,8 @@ compileKotlin {
 
 dependencies {
     testImplementation project(":ext-acorn-testing")
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.mockito.kotlin:mockito-kotlin"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter.engine
 }
diff --git a/gradle.properties b/gradle.properties
index 7b6946b5..c1896c7f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,9 @@
 android.enableJetifier=true
 android.useAndroidX=true
 
+# Disable AGP's JDK image transform to avoid jlink requirement during builds (helps CI and non-Android JDKs)
+android.experimental.disableAndroidJdkImageTransform=true
+
 org.gradle.jvmargs=-Xmx4g
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..a5c8c0e1
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,107 @@
+[versions]
+kotlin = "2.2.20"
+androidx-annotation = "1.9.1"
+appcompat = "1.7.1"
+interpolator = "1.0.0"
+rxjava2 = "2.2.21"
+rxkotlin2 = "2.4.0"
+timber = "5.0.1"
+lifecycle-runtime = "2.9.3"
+core-ktx = "1.17.0"
+material = "1.13.0"
+constraintlayout = "2.2.1"
+rxandroid2 = "2.1.1"
+picasso = "2.71828"
+konfetti = "1.3.2"
+rxbinding3 = "3.1.0"
+sqlbrite3 = "3.2.0"
+arch-persistence-db = "1.1.1"
+expectkt = "1.0.1"
+mockito-kotlin = "6.0.0"
+junit-jupiter = "5.13.4"
+junit4 = "4.13.2"
+espresso = "3.7.0"
+androidx-test = "1.7.0"
+uiautomator = "2.3.0"
+android-tools = "30.0.1"
+android-gradle = "8.13.0"
+kotlin-plugin = "2.2.20"
+pitest-core = "1.4.9"
+pitest-junit5-plugin = "0.14"
+android-junit5-plugin = "1.13.4.0"
+test-logger-plugin = "4.0.0"
+gradle-pitest-plugin = "1.15.0"
+
+[libraries]
+# Kotlin
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
+kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+
+# Core
+androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
+
+# ext-acorn-android
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-interpolator = { module = "androidx.interpolator:interpolator", version.ref = "interpolator" }
+
+# ext-acorn-rx
+rxjava2 = { module = "io.reactivex.rxjava2:rxjava", version.ref = "rxjava2" }
+rxkotlin2 = { module = "io.reactivex.rxjava2:rxkotlin", version.ref = "rxkotlin2" }
+
+# ext-acorn-android-timber
+timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
+
+# ext-acorn-android-lifecycle
+androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "lifecycle-runtime" }
+
+# "Hello" sample apps
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+rxandroid2 = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxandroid2" }
+picasso = { module = "com.squareup.picasso:picasso", version.ref = "picasso" }
+konfetti = { module = "nl.dionsegijn:konfetti", version.ref = "konfetti" }
+
+# Notes app
+rxbinding3 = { module = "com.jakewharton.rxbinding3:rxbinding", version.ref = "rxbinding3" }
+rxbinding3-appcompat = { module = "com.jakewharton.rxbinding3:rxbinding-appcompat", version.ref = "rxbinding3" }
+sqlbrite3-kotlin = { module = "com.squareup.sqlbrite3:sqlbrite-kotlin", version.ref = "sqlbrite3" }
+arch-persistence-db-framework = { module = "android.arch.persistence:db-framework", version.ref = "arch-persistence-db" }
+
+# Testing & checks
+expectkt = { module = "com.nhaarman:expect.kt", version.ref = "expectkt" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
+pitest-junit5 = { module = "org.pitest:pitest-junit5-plugin", version.ref = "pitest-junit5-plugin" }
+
+androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
+androidx-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
+androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
+androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
+uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" }
+
+# JUnit 4
+junit4 = { module = "junit:junit", version.ref = "junit4" }
+
+# Android tools / lint
+android-lint = { module = "com.android.tools.lint:lint", version.ref = "android-tools" }
+android-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "android-tools" }
+android-lint-checks = { module = "com.android.tools.lint:lint-checks", version.ref = "android-tools" }
+android-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "android-tools" }
+
+[bundles]
+junit-jupiter = ["junit-jupiter-api", "junit-jupiter-engine"]
+espresso = ["androidx-espresso-core", "androidx-espresso-contrib", "androidx-test-runner", "androidx-test-rules"]
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "android-gradle" }
+android-library = { id = "com.android.library", version.ref = "android-gradle" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-plugin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-plugin" }
+ben-manes-versions = { id = "com.github.ben-manes.versions", version = "0.52.0" }
+android-junit5 = { id = "de.mannodermaus.android-junit5", version.ref = "android-junit5-plugin" }
+test-logger = { id = "com.adarshr.test-logger", version.ref = "test-logger-plugin" }
+pitest = { id = "info.solidsoft.pitest", version.ref = "gradle-pitest-plugin" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79..d64cd491 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c85a1f7..7705927e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb..1aa94a42 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/releasing.md b/releasing.md
index 70537a40..0950fd6d 100644
--- a/releasing.md
+++ b/releasing.md
@@ -1,11 +1,53 @@
 # Releasing
 
-To push a release to Maven Central:
+## Requirements
+- Sonatype Central account and ownership of the `com.nhaarman.acorn` namespace.
+- Central Publishing Token (username/password).
+- PGP signing key and a secret key ring file (secring.gpg).
 
- - Tag the commit as a release: `git tag -a x.x.x -m x.x.x`
- - Push the tags: `git push --tags`
- - Execute `./gradlew publish`
- - Head over to `https://oss.sonatype.org/#stagingRepositories` and close and release the repository.
+## Create secring.gpg
+1) Find your key ID:
+- `gpg --list-secret-keys --keyid-format LONG`
 
- - Execute `./gradlew orchidDeploy` to deploy the documentation website;
-   - `./gradlew orchidDeploy -PversionName=1.0.0` to force the version name.
+2) Export the secret key ring file (binary):
+- macOS/Linux:
+  - `gpg --export-secret-keys YOUR_KEY_ID > ~/.gnupg/secring.gpg`
+  - `chmod 600 ~/.gnupg/secring.gpg`
+- Windows (PowerShell):
+  - `gpg --export-secret-keys YOUR_KEY_ID | Set-Content -Encoding Byte "$env:APPDATA\gnupg\secring.gpg"`
+
+Keep `secring.gpg` private (never commit it). Do NOT paste your private key into gradle.properties.
+
+## Configure Gradle (~/.gradle/gradle.properties)
+```properties
+# Central Publishing Portal
+centralPortalUsername=YOUR_PUBLISHING_TOKEN_USERNAME
+centralPortalPassword=YOUR_PUBLISHING_TOKEN_PASSWORD
+
+# PGP signing (secret key ring file)
+signing.keyId=YOUR_KEY_ID
+signing.password=YOUR_KEY_PASSPHRASE
+signing.secretKeyRingFile=/absolute/path/to/secring.gpg
+```
+
+## Versioning
+- You must pass the version at build time. Use `-PversionName=1.2.3` (or `-Pversion=1.2.3`).
+- Android modules can optionally specify a version code with `-PversionCode=123`.
+- Snapshot builds must end with `-SNAPSHOT`, e.g. `-PversionName=1.2.4-SNAPSHOT`.
+
+## Publish a release (Central Publishing Portal)
+1) Choose a release version (no `-SNAPSHOT`) and ensure POM metadata is correct (configured in `.ops/publishing.gradle`).
+2) Run: `./gradlew publish -PversionName=1.2.3 -PcentralPortal=true`.
+3) Monitor https://central.sonatype.com/ → Publishing Activity until processing completes (artifacts appear on search.maven.org shortly after).
+
+## Publish a snapshot (OSSRH snapshots repository)
+1) Use a snapshot version: `-PversionName=1.2.4-SNAPSHOT`.
+2) Run: `./gradlew publish -PversionName=1.2.4-SNAPSHOT` (do NOT pass `-PcentralPortal=true`).
+3) Artifacts will be uploaded to `s01.oss.sonatype.org` snapshots and are not listed on search.maven.org.
+
+## Troubleshooting
+- Missing required project property: If you see `Missing required project property: versionName (or version)`, pass a version via `-PversionName=1.2.3` (or `-Pversion=1.2.3`).
+- Central Portal rejects SNAPSHOT: Central Publishing Portal does not accept `-SNAPSHOT` versions. Use a release version and `-PcentralPortal=true`, or publish snapshots without `-PcentralPortal`.
+- 401/403 during upload: check token credentials and ensure Central Publishing is enabled (`-PcentralPortal=true`).
+- Missing signatures: ensure `signing.keyId`, `signing.password`, and `signing.secretKeyRingFile` are set as above.
+- Validation failures: open the item in Publishing Activity for details.
diff --git a/samples/hello-bottombar/build.gradle b/samples/hello-bottombar/build.gradle
index 54ad8037..773be9c7 100644
--- a/samples/hello-bottombar/build.gradle
+++ b/samples/hello-bottombar/build.gradle
@@ -16,27 +16,26 @@ dependencies {
     implementation project(":ext-acorn-rx")
     implementation project(":ext-acorn-android-appcompat")
 
+    implementation libs.androidx.core.ktx
 
-    implementation "androidx.core:core-ktx"
+    implementation libs.rxjava2
+    implementation libs.rxkotlin2
+    implementation libs.rxandroid2
 
-    implementation "io.reactivex.rxjava2:rxjava"
-    implementation "io.reactivex.rxjava2:rxkotlin"
-    implementation "io.reactivex.rxjava2:rxandroid"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
-
-    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
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/hello-concurrentpairnavigator/build.gradle b/samples/hello-concurrentpairnavigator/build.gradle
index 27fb28dc..473007b3 100644
--- a/samples/hello-concurrentpairnavigator/build.gradle
+++ b/samples/hello-concurrentpairnavigator/build.gradle
@@ -19,27 +19,26 @@ dependencies {
     implementation project(":ext-acorn-rx")
     implementation project(":ext-acorn-android-appcompat")
 
+    implementation libs.androidx.core.ktx
 
-    implementation "androidx.core:core-ktx"
+    implementation libs.rxjava2
+    implementation libs.rxkotlin2
+    implementation libs.rxandroid2
 
-    implementation "io.reactivex.rxjava2:rxjava"
-    implementation "io.reactivex.rxjava2:rxkotlin"
-    implementation "io.reactivex.rxjava2:rxandroid"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
-
-    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
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/hello-concurrentpairnavigator/src/main/java/com/nhaarman/acorn/samples/helloconcurrentpairnavigator/FirstScene.kt b/samples/hello-concurrentpairnavigator/src/main/java/com/nhaarman/acorn/samples/helloconcurrentpairnavigator/FirstScene.kt
index 0ed4ccb6..2e7282e7 100644
--- a/samples/hello-concurrentpairnavigator/src/main/java/com/nhaarman/acorn/samples/helloconcurrentpairnavigator/FirstScene.kt
+++ b/samples/hello-concurrentpairnavigator/src/main/java/com/nhaarman/acorn/samples/helloconcurrentpairnavigator/FirstScene.kt
@@ -79,6 +79,7 @@ class FirstSceneViewController(
 
     private val binding = FirstSceneBinding.bind(view)
 
+    @android.annotation.SuppressLint("SetTextI18n")
     override var count: Long = 0
         set(value) {
             binding.counterTV.text = value.toString()
diff --git a/samples/hello-navigation/build.gradle b/samples/hello-navigation/build.gradle
index 734bb996..bdd7fb16 100644
--- a/samples/hello-navigation/build.gradle
+++ b/samples/hello-navigation/build.gradle
@@ -18,22 +18,22 @@ dependencies {
     implementation project(":ext-acorn-android-appcompat")
 
 
-    implementation "androidx.core:core-ktx"
+    implementation libs.androidx.core.ktx
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    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
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/hello-overridingback/build.gradle b/samples/hello-overridingback/build.gradle
index 533ab842..2c2ef597 100644
--- a/samples/hello-overridingback/build.gradle
+++ b/samples/hello-overridingback/build.gradle
@@ -18,23 +18,23 @@ dependencies {
     implementation project(":ext-acorn-android-appcompat")
 
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    implementation "nl.dionsegijn:konfetti"
+    implementation libs.konfetti
 
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.expectkt
+    testImplementation libs.junit.jupiter.api
+    testRuntimeOnly libs.junit.jupiter.engine
 
     debugImplementation project(":ext-acorn-android-testing")
-    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 "androidx.test.uiautomator:uiautomator"
+    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
+    androidTestImplementation libs.uiautomator
 }
 
diff --git a/samples/hello-sharedata/build.gradle b/samples/hello-sharedata/build.gradle
index a61262a7..317c459a 100644
--- a/samples/hello-sharedata/build.gradle
+++ b/samples/hello-sharedata/build.gradle
@@ -18,29 +18,28 @@ dependencies {
     implementation project(":ext-acorn-android-appcompat")
     implementation project(":ext-acorn-rx")
 
+    implementation libs.androidx.core.ktx
 
-    implementation "androidx.core:core-ktx"
+    implementation libs.rxjava2
+    implementation libs.rxkotlin2
+    implementation libs.rxandroid2
 
-    implementation "io.reactivex.rxjava2:rxjava"
-    implementation "io.reactivex.rxjava2:rxkotlin"
-    implementation "io.reactivex.rxjava2:rxandroid"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
+    implementation libs.picasso
 
-    implementation "com.squareup.picasso:picasso"
-
-    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
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/hello-sharedata/src/main/java/com/nhaarman/acorn/samples/hellosharedata/pictures/PictureContentProvider.kt b/samples/hello-sharedata/src/main/java/com/nhaarman/acorn/samples/hellosharedata/pictures/PictureContentProvider.kt
index 2503fa0f..c8ae6e71 100644
--- a/samples/hello-sharedata/src/main/java/com/nhaarman/acorn/samples/hellosharedata/pictures/PictureContentProvider.kt
+++ b/samples/hello-sharedata/src/main/java/com/nhaarman/acorn/samples/hellosharedata/pictures/PictureContentProvider.kt
@@ -21,6 +21,7 @@ import android.content.ContentValues
 import android.database.Cursor
 import android.net.Uri
 import android.os.ParcelFileDescriptor
+import androidx.core.net.toUri
 import java.io.File
 
 class PictureContentProvider : ContentProvider() {
@@ -67,7 +68,7 @@ class PictureContentProvider : ContentProvider() {
         private const val authority = "com.nhaarman.acorn.samples.hellosharedata"
 
         fun uriFor(file: File): Uri {
-            return Uri.parse("content://${PictureContentProvider.authority}${file.absolutePath}")
+            return ("content://${PictureContentProvider.authority}${file.absolutePath}").toUri()
         }
     }
 }
diff --git a/samples/hello-startactivity/build.gradle b/samples/hello-startactivity/build.gradle
index 2c1b45a8..d18691f5 100644
--- a/samples/hello-startactivity/build.gradle
+++ b/samples/hello-startactivity/build.gradle
@@ -17,23 +17,22 @@ android {
 dependencies {
     implementation project(":ext-acorn-android-appcompat")
 
-
-    implementation "androidx.core:core-ktx"
-
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
-
-    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 "androidx.test.uiautomator:uiautomator"
+    implementation libs.androidx.core.ktx
+
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
+
+    testImplementation libs.expectkt
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.junit.jupiter.api
+    testRuntimeOnly libs.junit.jupiter.engine
+
+    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
+    androidTestImplementation libs.uiautomator
 }
diff --git a/samples/hello-startactivity/src/main/java/com/nhaarman/acorn/samples/hellostartactivity/AppSettingsActivityController.kt b/samples/hello-startactivity/src/main/java/com/nhaarman/acorn/samples/hellostartactivity/AppSettingsActivityController.kt
index a063ca5b..283aa41b 100644
--- a/samples/hello-startactivity/src/main/java/com/nhaarman/acorn/samples/hellostartactivity/AppSettingsActivityController.kt
+++ b/samples/hello-startactivity/src/main/java/com/nhaarman/acorn/samples/hellostartactivity/AppSettingsActivityController.kt
@@ -18,8 +18,8 @@ package com.nhaarman.acorn.samples.hellostartactivity
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.provider.Settings
+import androidx.core.net.toUri
 import com.nhaarman.acorn.android.presentation.ActivityController
 
 class AppSettingsActivityController(
@@ -34,7 +34,7 @@ class AppSettingsActivityController(
         return Intent().apply {
             action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
             addCategory(Intent.CATEGORY_DEFAULT)
-            data = Uri.parse("package:" + context.getPackageName())
+            data = ("package:" + context.packageName).toUri()
         }
     }
 
diff --git a/samples/hello-staterestoration/build.gradle b/samples/hello-staterestoration/build.gradle
index 0aece6de..fdc0f273 100644
--- a/samples/hello-staterestoration/build.gradle
+++ b/samples/hello-staterestoration/build.gradle
@@ -18,21 +18,20 @@ dependencies {
     implementation project(":ext-acorn-android-appcompat")
     debugImplementation project(":ext-acorn-android-statechecks")
 
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
-
-    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
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/hello-transitionanimation/build.gradle b/samples/hello-transitionanimation/build.gradle
index 521d4de8..38f6b10f 100644
--- a/samples/hello-transitionanimation/build.gradle
+++ b/samples/hello-transitionanimation/build.gradle
@@ -17,23 +17,22 @@ android {
 dependencies {
     implementation project(":ext-acorn-android-appcompat")
 
+    implementation libs.androidx.core.ktx
 
-    implementation "androidx.core:core-ktx"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
-
-    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
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/hello-viewfactory/build.gradle b/samples/hello-viewfactory/build.gradle
index 92746805..f2497570 100644
--- a/samples/hello-viewfactory/build.gradle
+++ b/samples/hello-viewfactory/build.gradle
@@ -15,20 +15,20 @@ dependencies {
     implementation project(":ext-acorn-android-appcompat")
 
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    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
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/hello-world/build.gradle b/samples/hello-world/build.gradle
index a0ac407f..8e21dda3 100644
--- a/samples/hello-world/build.gradle
+++ b/samples/hello-world/build.gradle
@@ -18,21 +18,21 @@ dependencies {
     implementation project(":ext-acorn-android")
 
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    implementation "com.jakewharton.timber:timber"
+    implementation libs.timber
 
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.expectkt
+    testImplementation libs.junit.jupiter.api
+    testRuntimeOnly libs.junit.jupiter.engine
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/notes-app/android/build.gradle b/samples/notes-app/android/build.gradle
index 08268390..5d67c5d8 100644
--- a/samples/notes-app/android/build.gradle
+++ b/samples/notes-app/android/build.gradle
@@ -34,26 +34,26 @@ dependencies {
 
     implementation project(":samples:notes-app")
 
-    implementation "androidx.core:core-ktx"
+    implementation libs.androidx.core.ktx
 
-    implementation "com.google.android.material:material"
-    implementation "androidx.constraintlayout:constraintlayout"
-    implementation "androidx.appcompat:appcompat"
+    implementation libs.material
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.appcompat
 
-    implementation "io.reactivex.rxjava2:rxjava"
-    implementation "io.reactivex.rxjava2:rxkotlin"
-    implementation "io.reactivex.rxjava2:rxandroid"
+    implementation libs.rxjava2
+    implementation libs.rxkotlin2
+    implementation libs.rxandroid2
 
-    implementation "com.jakewharton.rxbinding3:rxbinding"
-    implementation "com.jakewharton.rxbinding3:rxbinding-appcompat"
+    implementation libs.rxbinding3
+    implementation libs.rxbinding3.appcompat
 
-    implementation "com.jakewharton.timber:timber"
+    implementation libs.timber
 
     debugImplementation project(":ext-acorn-android-testing")
-    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
 }
diff --git a/samples/notes-app/build.gradle b/samples/notes-app/build.gradle
index d6f7e5b7..9aeedba6 100644
--- a/samples/notes-app/build.gradle
+++ b/samples/notes-app/build.gradle
@@ -6,12 +6,12 @@ dependencies {
     implementation project(":ext-acorn")
     implementation project(":ext-acorn-rx")
 
-    api "io.reactivex.rxjava2:rxjava"
-    implementation "io.reactivex.rxjava2:rxkotlin"
+    api libs.rxjava2
+    implementation libs.rxkotlin2
 
     testImplementation project(":ext-acorn-testing")
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testImplementation "org.mockito.kotlin:mockito-kotlin"
-    testImplementation "com.nhaarman:expect.kt"
-    testImplementation "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation libs.junit.jupiter.api
+    testImplementation libs.mockito.kotlin
+    testImplementation libs.expectkt
+    testImplementation libs.junit.jupiter.engine
 }
diff --git a/settings.gradle b/settings.gradle
index 290fedfe..b2fdb27c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,17 @@
+// Typesafe project accessors are disabled for now to avoid accessor name collisions
+// enableFeaturePreview('TYPESAFE_PROJECT_ACCESSORS')
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    versionCatalogs {
+        create("libs") { /* TOML-backed; definitions live in gradle/libs.versions.toml */ }
+    }
+}
+
 include(":core")
 include(":acorn")
 include(":acorn-android")
@@ -17,6 +31,7 @@ include(":ext-acorn-android-appcompat")
 include(":ext-acorn-android-lifecycle")
 include(":ext-acorn-android-statechecks")
 
+include(":samples")
 include(":samples:hello-world")
 include(":samples:hello-navigation")
 include(":samples:hello-overridingback")