Skip to content

Commit d47f9cd

Browse files
committed
chore: kotlin 2.1.0 update and misc fixes
1 parent b4e74b0 commit d47f9cd

File tree

11 files changed

+83
-48
lines changed

11 files changed

+83
-48
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: 🕸 Deploy Wasm, Js & Compose webapp to Github Pages
124124
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
125-
uses: JamesIves/github-pages-deploy-action@v4.6.9
125+
uses: JamesIves/github-pages-deploy-action@v4.7.1
126126
with:
127127
branch: gh-pages
128128
folder: backend/jvm/build/resources/main/app
@@ -132,7 +132,7 @@ jobs:
132132

133133
- name: 📡 Publish documentation to Github Pages
134134
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
135-
uses: JamesIves/github-pages-deploy-action@v4.6.9
135+
uses: JamesIves/github-pages-deploy-action@v4.7.1
136136
with:
137137
branch: gh-pages
138138
folder: build/dokka/html
@@ -142,7 +142,7 @@ jobs:
142142

143143
- name: 🏖️ Publish coverage report to Github Pages
144144
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
145-
uses: JamesIves/github-pages-deploy-action@v4.6.9
145+
uses: JamesIves/github-pages-deploy-action@v4.7.1
146146
with:
147147
branch: gh-pages
148148
folder: build/reports/kover/html
@@ -152,7 +152,7 @@ jobs:
152152

153153
- name: 🧪️ Publish test report to Github Pages
154154
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
155-
uses: JamesIves/github-pages-deploy-action@v4.6.9
155+
uses: JamesIves/github-pages-deploy-action@v4.7.1
156156
with:
157157
branch: gh-pages
158158
folder: build/reports/allTests

backend/native/src/nativeMain/kotlin/Main.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import kotlin.reflect.typeOf
66
import kotlin.time.Duration
77
import kotlinx.coroutines.flow.take
88
import kotlinx.coroutines.runBlocking
9-
import kotlinx.serialization.Serializable
9+
import kotlinx.serialization.*
1010

1111
data class ProcessResult(val code: Int, val rawOutput: String?)
1212

gradle/build-logic/src/main/kotlin/common/Multiplatform.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,7 @@ fun KotlinMultiplatformExtension.hostNativeTarget(configure: KotlinNativeTarget.
261261
}
262262

263263
fun KotlinNativeCompilerOptions.configureKotlinNative() {
264-
freeCompilerArgs.addAll(
265-
// "-Xverbose-phases=Linker"
266-
// "-Xruntime-logs=gc=info"
267-
)
264+
// freeCompilerArgs.addAll("-Xverbose-phases=Linker", "-Xruntime-logs=gc=info")
268265
}
269266

270267
fun KotlinMultiplatformExtension.allNativeTargets(configure: KotlinNativeTarget.() -> Unit = {}) {
@@ -274,6 +271,13 @@ fun KotlinMultiplatformExtension.allNativeTargets(configure: KotlinNativeTarget.
274271
configure()
275272
}
276273

274+
compilerOptions {
275+
optIn.addAll(
276+
"kotlinx.cinterop.ExperimentalForeignApi",
277+
"kotlin.experimental.ExperimentalNativeApi",
278+
)
279+
}
280+
277281
macosX64 { configureAll() }
278282
macosArm64 { configureAll() }
279283
linuxX64 { configureAll() }

gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,29 +391,31 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
391391
apiVersion = kotlinApiVersion
392392
languageVersion = kotlinLangVersion
393393
progressiveMode = true
394+
extraWarnings = false
394395
allWarningsAsErrors = false
395396
suppressWarnings = false
396397
verbose = false
397398
freeCompilerArgs.addAll(
398399
"-Xexpect-actual-classes",
399400
"-Xskip-prerelease-check",
401+
"-Xwhen-guards",
400402
"-Xmulti-dollar-interpolation",
403+
"-Xnon-local-break-continue",
401404
// "-XXLanguage:+ExplicitBackingFields",
402405
// "-Xsuppress-version-warnings",
403406
// "-P",
404407
// "plugin:...=..."
405408
)
406409
optIn.addAll(
407410
"kotlin.ExperimentalStdlibApi",
408-
"kotlin.contracts.ExperimentalContracts",
409411
"kotlin.ExperimentalUnsignedTypes",
412+
"kotlin.contracts.ExperimentalContracts",
410413
"kotlin.io.encoding.ExperimentalEncodingApi",
411414
"kotlin.time.ExperimentalTime",
412415
"kotlinx.coroutines.ExperimentalCoroutinesApi",
413416
"kotlinx.serialization.ExperimentalSerializationApi",
414417
"kotlin.ExperimentalMultiplatform",
415418
"kotlin.js.ExperimentalJsExport",
416-
"kotlin.experimental.ExperimentalNativeApi",
417419
"kotlin.uuid.ExperimentalUuidApi",
418420
// "org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi",
419421
)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import com.github.ajalt.mordant.rendering.TextColors
22
import com.google.cloud.tools.jib.gradle.BuildDockerTask
33
import com.google.devtools.ksp.gradle.KspAATask
4+
import com.javiersc.kotlin.kopy.args.KopyFunctions
45
import common.*
56
import java.io.PrintWriter
67
import java.io.StringWriter
@@ -20,7 +21,7 @@ plugins {
2021
kotlin("plugin.power-assert")
2122
com.google.devtools.ksp
2223
dev.zacsweers.redacted
23-
// com.javiersc.kotlin.kopy
24+
com.javiersc.kotlin.kopy
2425
org.jetbrains.kotlinx.atomicfu
2526
id("dev.suresh.plugin.kotlin.docs")
2627
// kotlin("plugin.atomicfu")
@@ -75,7 +76,7 @@ redacted {
7576
replacementString = ""
7677
}
7778

78-
// kopy { functions = KopyFunctions.Copy }
79+
kopy { functions = KopyFunctions.Copy }
7980

8081
// Java agent configuration for jib
8182
val javaAgent by configurations.registering { isTransitive = false }

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
@file:OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalBCVApi::class)
33

44
import com.google.devtools.ksp.gradle.KspAATask
5+
import com.javiersc.kotlin.kopy.args.KopyFunctions
56
import common.*
67
import java.time.ZonedDateTime
78
import java.time.format.DateTimeFormatter
@@ -23,7 +24,7 @@ plugins {
2324
id("dev.suresh.plugin.kotlin.docs")
2425
com.google.devtools.ksp
2526
dev.zacsweers.redacted
26-
// com.javiersc.kotlin.kopy
27+
com.javiersc.kotlin.kopy
2728
org.jetbrains.kotlinx.atomicfu
2829
// kotlin("plugin.atomicfu")
2930
// kotlin("plugin.compose")
@@ -96,7 +97,7 @@ redacted {
9697
replacementString = ""
9798
}
9899

99-
// kopy { functions = KopyFunctions.Copy }
100+
kopy { functions = KopyFunctions.Copy }
100101

101102
tasks {
102103
if (isSharedProject) {

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

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

0 commit comments

Comments
 (0)