Update dependencies (#126)

05nelsonm · web-flow · commit 822f4336d807 · 2025-08-24T06:00:57.000-04:00
* Update gradle wrapper: 8.12.1 -&gt; 8.14.3
* Update gradle-maven-publish: 0.30.0 -&gt; 0.34.0
* Update binary-compatibility-validator: 0.17.0 -&gt; 0.18.1
* Update gradle-kmp-configuration: 0.4.0 -&gt; 0.5.2
* Update kotlin: 2.1.10 -&gt; 2.2.10
* Update kotlinx-benchmark: 0.4.13 -&gt; 0.4.14
* Update gradle-android: 8.7.3 -&gt; 8.10.1
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -63,7 +63,7 @@ jobs:
 
       - name: Upload Test Reports
         uses: actions/upload-artifact@v4
-        if: ${{ always() }}
+        if: always()
         with:
           name: test-report-${{ matrix.os }}-java${{ matrix.java-version }}
           path: '**/build/reports/tests/**'
@@ -133,8 +133,10 @@ jobs:
 
       - name: Upload Test Reports
         uses: actions/upload-artifact@v4
-        if: ${{ always() }}
+        if: always()
         with:
           name: test-report-android-${{ matrix.api-level }}
-          path: '**/build/reports/androidTests/**'
+          path: |
+            **/build/reports/androidTests/**
+            **/build/outputs/androidTest-results/connected/debug/*/logcat-*.txt
           retention-days: 1
diff --git a/.kotlin-js-store/js/yarn.lock b/.kotlin-js-store/js/yarn.lock
diff --git a/.kotlin-js-store/wasm/yarn.lock b/.kotlin-js-store/wasm/yarn.lock
diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -16,13 +16,12 @@
 import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
 import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
 import org.gradle.api.Action
-import org.gradle.api.JavaVersion
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 fun KmpConfigurationExtension.configureShared(
     java9ModuleName: String? = null,
     publish: Boolean = false,
-    action: Action<KmpConfigurationContainerDsl>
+    action: Action<KmpConfigurationContainerDsl>,
 ) {
     if (publish) {
         require(!java9ModuleName.isNullOrBlank()) { "publications must specify a module-info name" }
@@ -34,10 +33,6 @@ fun KmpConfigurationExtension.configureShared(
         }
 
         jvm {
-            kotlinJvmTarget = JavaVersion.VERSION_1_8
-            compileSourceCompatibility = JavaVersion.VERSION_1_8
-            compileTargetCompatibility = JavaVersion.VERSION_1_8
-
             java9ModuleInfoName = java9ModuleName
         }
 
diff --git a/build-logic/src/main/kotlin/publication.gradle.kts b/build-logic/src/main/kotlin/publication.gradle.kts
@@ -13,18 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-import org.gradle.plugins.signing.SigningExtension
-
 plugins {
     id("com.vanniktech.maven.publish")
 }
 
-if (!version.toString().endsWith("-SNAPSHOT")) {
-    extensions.configure<SigningExtension>("signing") {
-        useGpgCmd()
-    }
-}
-
 tasks.withType<AbstractArchiveTask>().configureEach {
     isPreserveFileTimestamps = false
     isReproducibleFileOrder = true
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,6 +16,8 @@
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
+import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnPlugin
+import org.jetbrains.kotlin.gradle.targets.wasm.yarn.WasmYarnRootExtension
 
 plugins {
     alias(libs.plugins.android.library) apply(false)
@@ -43,7 +45,7 @@ allprojects {
             // Only allow snapshot dependencies for non-release versions.
             // This would cause a build failure if attempting to make a release
             // while depending on a -SNAPSHOT version (such as core).
-            maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+            maven("https://central.sonatype.com/repository/maven-snapshots/")
         }
     }
 }
@@ -52,9 +54,16 @@ allprojects {
 val CHECK_PUBLICATION = findProperty("CHECK_PUBLICATION") != null
 
 plugins.withType<YarnPlugin> {
-    the<YarnRootExtension>().lockFileDirectory = rootDir.resolve(".kotlin-js-store")
-    if (CHECK_PUBLICATION) {
-        the<YarnRootExtension>().yarnLockMismatchReport = YarnLockMismatchReport.NONE
+    the<YarnRootExtension>().apply {
+        lockFileDirectory = rootDir.resolve(".kotlin-js-store").resolve("js")
+        if (CHECK_PUBLICATION) yarnLockMismatchReport = YarnLockMismatchReport.NONE
+    }
+}
+
+plugins.withType<WasmYarnPlugin> {
+    the<WasmYarnRootExtension>().apply {
+        lockFileDirectory = rootDir.resolve(".kotlin-js-store").resolve("wasm")
+        if (CHECK_PUBLICATION) yarnLockMismatchReport = YarnLockMismatchReport.NONE
     }
 }
 
diff --git a/gh-pages/publish.sh b/gh-pages/publish.sh
@@ -30,7 +30,8 @@ cd ..
 cp -aR build/dokka/html/* gh-pages/$REPO_NAME
 
 cd "$DIR_SCRIPT/$REPO_NAME"
-sed -i "s|module:|module:library/|g" "package-list"
+PACKAGE_LIST="$(sed "s|module:|module:library/|g" "package-list")"
+echo "$PACKAGE_LIST" > package-list
 
 git add --all
 git commit -S --message "Update dokka docs"
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ kotlin.native.ignoreDisabledTargets=true
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
-SONATYPE_HOST=S01
+SONATYPE_HOST=CENTRAL_PORTAL
 RELEASE_SIGNING_ENABLED=true
 
 GROUP=org.kotlincrypto.core
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,15 +2,15 @@
 #noinspection GradleDependency
 androidx-test-runner        = "1.5.2" # Do not upgrade. Tests run for API 15+, where next version requires minSdk 19+
 
-gradle-benchmark            = "0.4.13"
-gradle-android              = "8.7.3"
-gradle-binary-compat        = "0.17.0"
+gradle-benchmark            = "0.4.14"
+gradle-android              = "8.10.1"
+gradle-binary-compat        = "0.18.1"
 gradle-dokka                = "2.0.0"
-gradle-kmp-configuration    = "0.4.0"
-gradle-kotlin               = "2.1.10"
-gradle-publish-maven        = "0.30.0"
+gradle-kmp-configuration    = "0.5.2"
+gradle-kotlin               = "2.2.10"
+gradle-publish-maven        = "0.34.0"
 
-kotlincrypto-error          = "0.3.0"
+kotlincrypto-error          = "0.3.0" # TODO: Update
 
 [libraries]
 gradle-dokka                = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "gradle-dokka" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,5 +4,5 @@ zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 
 # https://gradle.org/release-checksums/
-distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
+distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
diff --git a/test-android/build.gradle.kts b/test-android/build.gradle.kts
@@ -22,17 +22,15 @@ repositories { google() }
 kmpConfiguration {
     configure {
         androidLibrary {
-            kotlinJvmTarget = JavaVersion.VERSION_11
-            compileSourceCompatibility = JavaVersion.VERSION_11
-            compileTargetCompatibility = JavaVersion.VERSION_11
-
             android {
+                buildToolsVersion = "35.0.1"
+                compileSdk = 35
                 namespace = "org.kotlincrypto.core"
-                compileSdk = 34
 
                 defaultConfig {
                     minSdk = 14
 
+                    testInstrumentationRunnerArguments["disableAnalytics"] = true.toString()
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 }
             }
diff --git a/test-android/src/androidMain/AndroidManifest.xml b/test-android/src/androidMain/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  * Copyright (c) 2025 KotlinCrypto
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  *     https://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *-->
+<manifest />
diff --git a/tools/check-publication/build.gradle.kts b/tools/check-publication/build.gradle.kts
@@ -13,22 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
+
 plugins {
     id("configuration")
 }
 
 repositories {
-    val host = "https://s01.oss.sonatype.org"
-
     if (version.toString().endsWith("-SNAPSHOT")) {
-        maven("$host/content/repositories/snapshots/")
+        maven("https://central.sonatype.com/repository/maven-snapshots/")
     } else {
-        maven("$host/content/groups/staging") {
+        maven("https://central.sonatype.com/api/v1/publisher/deployments/download/") {
             val p = rootProject.properties
-
-            credentials {
-                username = p["mavenCentralUsername"]?.toString()
-                password = p["mavenCentralPassword"]?.toString()
+            authentication.create("Authorization", HttpHeaderAuthentication::class.java)
+            credentials(HttpHeaderCredentials::class.java) {
+                val username = p["mavenCentralUsername"]?.toString() ?: throw NullPointerException()
+                val password = p["mavenCentralPassword"]?.toString() ?: throw NullPointerException()
+                name = "Authorization"
+                @OptIn(ExperimentalEncodingApi::class)
+                value = "Bearer " + Base64.Mime.encode("$username:$password".encodeToByteArray())
             }
         }
     }
