Skip to content

Commit e6d33e8

Browse files
Merge pull request #74 from Doist/goncalossilva/update-kotlin
2 parents df2316c + 82c528e commit e6d33e8

4 files changed

Lines changed: 237 additions & 206 deletions

File tree

build.gradle.kts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,38 @@
11
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
22
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
33
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
4-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
54

65
plugins {
76
kotlin("multiplatform")
87
id("targets")
98
id("cinterop")
109
id("publish")
11-
id("com.goncalossilva.resources") version "0.4.0"
10+
id("com.goncalossilva.resources") version "0.9.0"
1211
}
1312

1413
repositories {
1514
mavenCentral()
1615
}
1716

1817
kotlin {
19-
jvmToolchain(11)
20-
2118
explicitApi()
2219

20+
jvmToolchain(11)
21+
2322
sourceSets {
2423
all {
2524
languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
2625
}
2726

28-
@Suppress("UNUSED_VARIABLE")
2927
val commonTest by getting {
3028
dependencies {
3129
implementation(kotlin("test"))
32-
implementation("com.goncalossilva:resources:0.4.2")
30+
implementation("com.goncalossilva:resources:0.9.0")
3331
}
3432
}
3533
}
3634
}
3735

38-
tasks.withType<JavaCompile>().configureEach {
39-
options.release.set(8)
40-
}
41-
4236
rootProject.plugins.withType(YarnPlugin::class.java) {
4337
rootProject.configure<YarnRootExtension> {
4438
yarnLockMismatchReport = YarnLockMismatchReport.WARNING

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88
}
99

1010
dependencies {
11-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
11+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
1212
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
1313
implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
1414
}

gradle.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ ossrhStagingProfileId=28f59cc72c4fe0
2323
# Build properties.
2424
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
2525
kotlin.code.style=official
26-
kotlin.js.generate.executable.default=false
26+
kotlin.mpp.applyDefaultHierarchyTemplate=false
2727
kotlin.mpp.enableCInteropCommonization=true
28-
kotlin.mpp.stability.nowarn=true
2928
kotlin.native.ignoreDisabledTargets=true
29+
kotlin.apple.xcodeCompatibility.nowarn=true
30+
kotlin.js.generate.executable.default=false
31+

0 commit comments

Comments
 (0)