KotlinCrypto · 05nelsonm · Nov 30, 2023 · Nov 30, 2023 · Nov 30, 2023
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -46,23 +46,23 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Run macOS Tests
         if: matrix.os == 'macos-latest'
         run: >
           ./gradlew check --stacktrace
-          -PKMP_TARGETS="JVM,JS,IOS_ARM32,IOS_ARM64,IOS_X64,IOS_SIMULATOR_ARM64,MACOS_ARM64,MACOS_X64,TVOS_ARM64,TVOS_X64,TVOS_SIMULATOR_ARM64,WATCHOS_ARM32,WATCHOS_ARM64,WATCHOS_DEVICE_ARM64,WATCHOS_X64,WATCHOS_X86,WATCHOS_SIMULATOR_ARM64,WASM,WASM_32"
+          -PKMP_TARGETS="JVM,JS,IOS_ARM64,IOS_X64,IOS_SIMULATOR_ARM64,MACOS_ARM64,MACOS_X64,TVOS_ARM64,TVOS_X64,TVOS_SIMULATOR_ARM64,WATCHOS_ARM32,WATCHOS_ARM64,WATCHOS_DEVICE_ARM64,WATCHOS_X64,WATCHOS_SIMULATOR_ARM64,WASM_JS,WASM_WASI"
       - name: Run Linux Tests
         if: matrix.os == 'ubuntu-latest'
         run: >
           ./gradlew check --stacktrace
-          -PKMP_TARGETS="JVM,JS,ANDROID_ARM32,ANDROID_ARM64,ANDROID_X64,ANDROID_X86,LINUX_ARM32HFP,LINUX_ARM64,LINUX_MIPS32,LINUX_MIPSEL32,LINUX_X64,WASM,WASM_32"
+          -PKMP_TARGETS="JVM,JS,ANDROID,ANDROID_ARM32,ANDROID_ARM64,ANDROID_X64,ANDROID_X86,LINUX_ARM64,LINUX_X64,WASM_JS,WASM_WASI"
       - name: Run Windows Tests
         if: matrix.os == 'windows-latest'
         run: >
           ./gradlew check --stacktrace
-          -PKMP_TARGETS="JVM,JS,MINGW_X64,MINGW_X86,WASM,WASM_32"
+          -PKMP_TARGETS="JVM,JS,MINGW_X64,WASM_JS,WASM_WASI"
 
   emulator:
     runs-on: macos-latest

diff --git a/.kotlin-js-store/yarn.lock b/.kotlin-js-store/yarn.lock
diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -33,8 +33,8 @@ fun KmpConfigurationExtension.configureShared(
         }
 
         js()
-//        wasm()
-        wasmNativeAll()
+//        wasmJs {}
+//        wasmWasi {}
 
         androidNativeAll()
 
@@ -47,9 +47,7 @@ fun KmpConfigurationExtension.configureShared(
         mingwAll()
 
         common {
-            if (publish) {
-                pluginIds("publication")
-            }
+            if (publish) { pluginIds("publication") }
 
             sourceSetTest {
                 dependencies {
@@ -58,11 +56,7 @@ fun KmpConfigurationExtension.configureShared(
             }
         }
 
-        if (explicitApi) {
-            kotlin {
-                explicitApi()
-            }
-        }
+        if (explicitApi) { kotlin { explicitApi() } }
 
         action.execute(this)
     }

diff --git a/build-logic/src/main/kotlin/configuration.gradle.kts b/build-logic/src/main/kotlin/configuration.gradle.kts
@@ -17,16 +17,19 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
 import org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED
 import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED
+import org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR
+import org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_OUT
 import org.gradle.api.tasks.testing.logging.TestLogEvent.STARTED
 
 plugins {
     id("io.matthewnelson.kmp.configuration")
 }
 
-tasks.withType<Test> {
+tasks.withType<AbstractTestTask> {
     testLogging {
         exceptionFormat = TestExceptionFormat.FULL
-        events(STARTED, PASSED, SKIPPED, FAILED)
+        events(STARTED, PASSED, SKIPPED, FAILED, STANDARD_ERROR, STANDARD_OUT)
         showStandardStreams = true
+        showStackTraces = true
     }
 }
diff --git a/build-logic/src/main/kotlin/publication.gradle.kts b/build-logic/src/main/kotlin/publication.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.plugins.signing.SigningExtension
-
 /*
  * Copyright (c) 2023 Matthew Nelson
  *
@@ -15,6 +13,8 @@ import org.gradle.plugins.signing.SigningExtension
  * 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")
 }
@@ -24,3 +24,8 @@ if (!version.toString().endsWith("-SNAPSHOT")) {
         useGpgCmd()
     }
 }
+
+tasks.withType<AbstractArchiveTask>().configureEach {
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,6 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.multiplatform) apply(false)
     alias(libs.plugins.android.library) apply(false)
@@ -82,6 +81,7 @@ tasks.withType<DependencyUpdatesTask> {
     // Example 3: using the full syntax
     resolutionStrategy {
         componentSelection {
+            @Suppress("RedundantSamConstructor")
             all(Action {
                 if (isNonStable(candidate.version) && !isNonStable(currentVersion)) {
                     reject("Release candidate")

diff --git a/gradle.properties b/gradle.properties
@@ -4,14 +4,10 @@ org.gradle.caching=true
 
 android.useAndroidX=true
 android.enableJetifier=true
-android.disableAutomaticComponentCreation=true
 
 kotlin.code.style=official
-kotlin.js.compiler=both
-kotlin.mpp.androidSourceSetLayoutVersion=2
-kotlin.mpp.enableCompatibilityMetadataVariant=true
+kotlin.mpp.applyDefaultHierarchyTemplate=false
 kotlin.mpp.stability.nowarn=true
-kotlin.native.binary.memoryModel=experimental
 kotlin.native.ignoreDisabledTargets=true
 
 SONATYPE_HOST=S01

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-android = "7.4.2"
+android = "8.1.4"
 androidxTestRunner = "1.5.2"
 binaryCompat = "0.13.2"
 bouncyCastle = "1.73"
-configuration = "0.1.1"
-cryptoCore = "0.3.0"
-cryptoHash = "0.3.0"
-encoding = "2.0.0"
-gradleVersions = "0.46.0"
-kotlin = "1.8.21"
-publish = "0.25.2"
+configuration = "0.1.5"
+cryptoCore = "0.4.0"
+cryptoHash = "0.4.0"
+encoding = "2.1.0"
+gradleVersions = "0.50.0"
+kotlin = "1.9.21"
+publish = "0.25.3"
 
 [libraries]
 kotlincrypto-core-digest = { module = "org.kotlincrypto.core:digest", version.ref = "cryptoCore" }

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=5625a0ae20fe000d9225d000b36909c7a0e0e8dda61c19b12da769add847c975
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionSha256Sum=f2b9ed0faf8472cbe469255ae6c86eddb77076c75191741b4a462f33128dd419
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
diff --git a/test-android/build.gradle.kts b/test-android/build.gradle.kts
@@ -22,7 +22,7 @@ repositories {
 }
 
 kmpConfiguration {
-    this.configure {
+    configure {
         androidLibrary {
             kotlinJvmTarget = JavaVersion.VERSION_11
             compileSourceCompatibility = JavaVersion.VERSION_11
@@ -37,12 +37,6 @@ kmpConfiguration {
 
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 }
-
-                libraryVariants.all {
-                    generateBuildConfigProvider.configure {
-                        enabled = false
-                    }
-                }
             }
 
             sourceSetTestInstrumented {

diff --git a/tools/testing/src/commonMain/kotlin/org/kotlincrypto/macs/MacUnitTest.kt b/tools/testing/src/commonMain/kotlin/org/kotlincrypto/macs/MacUnitTest.kt
@@ -85,7 +85,6 @@ abstract class MacUnitTest {
         val copy = mac.copy()
         copy.reset()
 
-        assertNotEquals(copy, mac)
         assertEquals(expectedResetSmallHash, copy.doFinal().encodeToString(TestData.base16))
         assertEquals(expectedUpdateSmallHash, mac.doFinal().encodeToString(TestData.base16))
     }