Bump dependencies to latest stable versions

05nelsonm · Nov 20, 2023 · 6121a09 · 6121a09
1 parent e918a04
commit 6121a09
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 456 deletions.
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()
 

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.binaryCompat)

diff --git a/gradle.properties b/gradle.properties
@@ -3,10 +3,8 @@ org.gradle.parallel=true
 org.gradle.caching=true
 
 kotlin.code.style=official
-kotlin.js.compiler=both
-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,9 +1,9 @@
 [versions]
-binaryCompat = "0.13.1"
-configuration = "0.1.1"
-gradleVersions = "0.46.0"
-kotlin = "1.8.21"
-publish = "0.25.2"
+binaryCompat = "0.13.2"
+configuration = "0.1.5"
+gradleVersions = "0.50.0"
+kotlin = "1.9.20"
+publish = "0.25.3"
 
 [libraries]
 gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "configuration" }

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/sample/README.md b/sample/README.md
@@ -6,7 +6,7 @@ Simple Application that will output encoded values of `Hello World!`
 
 Java:
 ```shell
-./gradlew :sample:run -PKMP_TARGETS="JVM"
+./gradlew :sample:jvmRun -PKMP_TARGETS="JVM"
 ```
 
 Native:

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -13,18 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
     id("configuration")
 }
 
 kmpConfiguration {
-    this.configure {
+    configure {
         jvm {
-            pluginIds("application")
+            target {
+                withJava()
 
-            target { withJava() }
+                @OptIn(ExperimentalKotlinGradlePluginApi::class)
+                mainRun {
+                    mainClass.set("MainKt")
+                }
+            }
 
             kotlinJvmTarget = JavaVersion.VERSION_1_8
             compileSourceCompatibility = JavaVersion.VERSION_1_8
@@ -79,10 +85,8 @@ kmpConfiguration {
                 }
             }
             os.isWindows -> {
-                @Suppress("DEPRECATION")
                 when (arch) {
                     X64 -> mingwX64(targetName) { target { setup() } }
-                    X86 -> mingwX86(targetName) { target { setup() } }
                 }
             }
         }
@@ -96,15 +100,5 @@ kmpConfiguration {
                 }
             }
         }
-
-        kotlin {
-            sourceSets {
-                findByName("jvmMain")?.run {
-                    extensions.configure<JavaApplication>("application") {
-                        mainClass.set("MainKt")
-                    }
-                }
-            }
-        }
     }
 }