Skip to content

Commit 38a11f0

Browse files
committed
chore: kotlin 2.2.20-Beta1 update
1 parent 40aa330 commit 38a11f0

File tree

7 files changed

+74
-49
lines changed

7 files changed

+74
-49
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ org.gradle.caching=true
55
org.gradle.configureondemand=true
66
org.gradle.configuration-cache=true
77
org.gradle.configuration-cache.problems=warn
8-
org.gradle.configuration-cache.parallel=true
8+
org.gradle.configuration-cache.parallel=false
99
org.gradle.kotlin.dsl.allWarningsAsErrors=true
1010
org.gradle.daemon=true
1111
# org.gradle.unsafe.isolated-projects=false

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.common.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import me.saket.bytesize.*
55
import org.gradle.kotlin.dsl.*
66

77
tasks {
8+
withType<AbstractTestTask>().configureEach { failOnNoDiscoveredTests = false }
9+
810
pluginManager.withPlugin("com.google.cloud.tools.jib") {
911
withType<BuildDockerTask>().configureEach {
1012
doLast {
@@ -92,8 +94,6 @@ tasks {
9294
}
9395
}
9496

95-
withType<AbstractTestTask>().configureEach { failOnNoDiscoveredTests = false }
96-
9797
// register<Copy>("copyTemplates") {
9898
// description = "Generate template classes"
9999
// group = LifecycleBasePlugin.BUILD_GROUP

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.mpp.gradle.kts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
@file:Suppress("UnstableApiUsage")
22

3-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
4-
import com.google.cloud.tools.jib.gradle.JibTask
3+
import com.github.jengelman.gradle.plugins.shadow.tasks.*
4+
import com.google.cloud.tools.jib.gradle.*
55
import common.*
66
import kotlinx.validation.*
77
import org.gradle.internal.os.OperatingSystem
88
import org.jetbrains.kotlin.gradle.targets.js.nodejs.*
9-
import org.jetbrains.kotlin.gradle.targets.js.npm.*
9+
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmExtension
1010
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.*
1111
import org.jetbrains.kotlin.gradle.targets.wasm.nodejs.*
12-
import org.jetbrains.kotlin.gradle.targets.wasm.npm.*
12+
import org.jetbrains.kotlin.gradle.targets.wasm.npm.WasmNpmExtension
1313
import tasks.*
1414

1515
plugins {
@@ -175,13 +175,10 @@ tasks {
175175
}
176176
}
177177

178-
// var npmEnabled: String? by rootProject.extra
179-
180178
plugins.withType<NodeJsPlugin> {
181179
the<NodeJsEnvSpec>().apply {
182180
download = true
183181
// version = libs.versions.nodejs.version.get()
184-
// downloadBaseUrl = "https://nodejs.org/download/nightly"
185182
}
186183

187184
rootProject.the<NpmExtension>().apply {
@@ -193,8 +190,8 @@ plugins.withType<WasmNodeJsPlugin> {
193190
the<WasmNodeJsEnvSpec>().apply {
194191
download = true
195192
// version = libs.versions.nodejs.version.get()
196-
// downloadBaseUrl = "https://nodejs.org/download/nightly"
197193
}
194+
198195
rootProject.the<WasmNpmExtension>().apply {
199196
lockFileDirectory = project.rootDir.resolve("gradle/kotlin-js-store/wasm")
200197
}

gradle/kotlin-js-store/package-lock.json

Lines changed: 23 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/kotlin-js-store/wasm/package-lock.json

Lines changed: 25 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)