Skip to content

Commit

Permalink
Bump dependencies to latest stable versions
Browse files Browse the repository at this point in the history
  • Loading branch information
05nelsonm committed Nov 20, 2023
1 parent e918a04 commit 6121a09
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 456 deletions.
436 changes: 13 additions & 423 deletions .kotlin-js-store/yarn.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ fun KmpConfigurationExtension.configureShared(
}

js()
// wasm()
wasmNativeAll()
// wasmJs {}
// wasmWasi {}

androidNativeAll()

Expand Down
7 changes: 5 additions & 2 deletions build-logic/src/main/kotlin/configuration.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
9 changes: 7 additions & 2 deletions build-logic/src/main/kotlin/publication.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.gradle.plugins.signing.SigningExtension

/*
* Copyright (c) 2023 Matthew Nelson
*
Expand All @@ -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")
}
Expand All @@ -24,3 +24,8 @@ if (!version.toString().endsWith("-SNAPSHOT")) {
useGpgCmd()
}
}

tasks.withType<AbstractArchiveTask>().configureEach {
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
}
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion sample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
24 changes: 9 additions & 15 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -79,10 +85,8 @@ kmpConfiguration {
}
}
os.isWindows -> {
@Suppress("DEPRECATION")
when (arch) {
X64 -> mingwX64(targetName) { target { setup() } }
X86 -> mingwX86(targetName) { target { setup() } }
}
}
}
Expand All @@ -96,15 +100,5 @@ kmpConfiguration {
}
}
}

kotlin {
sourceSets {
findByName("jvmMain")?.run {
extensions.configure<JavaApplication>("application") {
mainClass.set("MainKt")
}
}
}
}
}
}

0 comments on commit 6121a09

Please sign in to comment.