Skip to content

Commit 9c273ac

Browse files
oldergodoldergod
committed
Address API changes
1 parent e781b33 commit 9c273ac

12 files changed

Lines changed: 75 additions & 57 deletions

File tree

‎build-support/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ allprojects {
8181
tasks.withType<KotlinCompile>().configureEach {
8282
compilerOptions {
8383
jvmTarget.set(JvmTarget.JVM_11)
84-
freeCompilerArgs.add("-Xjvm-default=all")
84+
freeCompilerArgs.add("-jvm-default=no-compatibility")
8585
}
8686
}
8787
}

‎build-support/src/main/kotlin/com/squareup/wire/buildsupport/WireBuildPlugin.kt‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import org.gradle.kotlin.dsl.register
5050
import org.gradle.kotlin.dsl.withType
5151
import org.jetbrains.dokka.gradle.DokkaExtension
5252
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
53-
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
5453
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
5554
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
5655
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
@@ -231,7 +230,7 @@ class WireBuildPlugin : Plugin<Project> {
231230
tasks.withType(KotlinJvmCompile::class.java).configureEach {
232231
compilerOptions {
233232
jvmTarget.set(JvmTarget.fromTarget(javaVersion.toString()))
234-
freeCompilerArgs.add("-Xjvm-default=all")
233+
freeCompilerArgs.add("-jvm-default=no-compatibility")
235234
}
236235
}
237236
// Kotlin requires the Java compatibility matches.
@@ -252,48 +251,46 @@ class WireBuildPlugin : Plugin<Project> {
252251
kotlin.configureWebKotlinLibraries()
253252
}
254253
plugins.withId("org.jetbrains.kotlin.js") {
255-
val kotlin = extensions.getByName("kotlin") as KotlinJsProjectExtension
256-
kotlin.configureWebKotlinLibraries()
254+
val kotlin = extensions.getByName("kotlin") as KotlinProjectExtension
255+
kotlin.configureJsKotlinLibraries()
257256
}
258257
}
259258

260259
// For KotlinWasm/Js, versions of toolchain and stdlib need to be the same:
261260
// https://youtrack.jetbrains.com/issue/KT-71032
262-
private fun KotlinProjectExtension.configureWebKotlinLibraries() {
261+
private fun KotlinProjectExtension.configureJsKotlinLibraries() {
263262
val kotlinVersion = project.getVersionByName("kotlin")
264263

265-
when (this) {
266-
is KotlinJsProjectExtension -> {
267-
val suffix = "js"
268-
sourceSets.apply {
269-
getByName("main").dependencies {
270-
implementation("org.jetbrains.kotlin:kotlin-stdlib-$suffix:$kotlinVersion")
271-
}
272-
getByName("test").dependencies {
273-
implementation("org.jetbrains.kotlin:kotlin-stdlib-$suffix:$kotlinVersion")
274-
implementation("org.jetbrains.kotlin:kotlin-test-$suffix:$kotlinVersion")
275-
}
276-
}
264+
val suffix = "js"
265+
sourceSets.apply {
266+
getByName("main").dependencies {
267+
implementation("org.jetbrains.kotlin:kotlin-stdlib-$suffix:$kotlinVersion")
277268
}
269+
getByName("test").dependencies {
270+
implementation("org.jetbrains.kotlin:kotlin-stdlib-$suffix:$kotlinVersion")
271+
implementation("org.jetbrains.kotlin:kotlin-test-$suffix:$kotlinVersion")
272+
}
273+
}
274+
}
278275

279-
is KotlinMultiplatformExtension -> {
280-
targets.matching { it.platformType in listOf(KotlinPlatformType.js, KotlinPlatformType.wasm) }.configureEach {
281-
val suffix = when (platformType) {
282-
KotlinPlatformType.js -> "js"
283-
KotlinPlatformType.wasm -> if (targetName.contains("wasi", true)) "wasm-wasi" else "wasm-js"
284-
else -> return@configureEach
285-
}
276+
private fun KotlinMultiplatformExtension.configureWebKotlinLibraries() {
277+
val kotlinVersion = project.getVersionByName("kotlin")
286278

287-
this@configureWebKotlinLibraries.sourceSets.apply {
288-
getByName("${targetName}Main").dependencies {
289-
implementation("org.jetbrains.kotlin:kotlin-stdlib-$suffix:$kotlinVersion")
290-
}
279+
targets.matching { it.platformType in listOf(KotlinPlatformType.js, KotlinPlatformType.wasm) }.configureEach {
280+
val suffix = when (platformType) {
281+
KotlinPlatformType.js -> "js"
282+
KotlinPlatformType.wasm -> if (targetName.contains("wasi", true)) "wasm-wasi" else "wasm-js"
283+
else -> return@configureEach
284+
}
291285

292-
getByName("${targetName}Test").dependencies {
293-
implementation("org.jetbrains.kotlin:kotlin-stdlib-$suffix:$kotlinVersion")
294-
implementation("org.jetbrains.kotlin:kotlin-test-$suffix:$kotlinVersion")
295-
}
296-
}
286+
this@configureWebKotlinLibraries.sourceSets.apply {
287+
getByName("${targetName}Main").dependencies {
288+
implementation("org.jetbrains.kotlin:kotlin-stdlib-$suffix:$kotlinVersion")
289+
}
290+
291+
getByName("${targetName}Test").dependencies {
292+
implementation("org.jetbrains.kotlin:kotlin-stdlib-$suffix:$kotlinVersion")
293+
implementation("org.jetbrains.kotlin:kotlin-test-$suffix:$kotlinVersion")
297294
}
298295
}
299296
}

‎kotlin-js-store/yarn.lock‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3034,7 +3034,16 @@ streamroller@^3.1.5:
30343034
debug "^4.3.4"
30353035
fs-extra "^8.1.0"
30363036

3037-
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
3037+
"string-width-cjs@npm:string-width@^4.2.0":
3038+
version "4.2.3"
3039+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
3040+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
3041+
dependencies:
3042+
emoji-regex "^8.0.0"
3043+
is-fullwidth-code-point "^3.0.0"
3044+
strip-ansi "^6.0.1"
3045+
3046+
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
30383047
version "4.2.3"
30393048
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
30403049
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -3066,7 +3075,14 @@ string_decoder@~1.1.1:
30663075
dependencies:
30673076
safe-buffer "~5.1.0"
30683077

3069-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
3078+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
3079+
version "6.0.1"
3080+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
3081+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
3082+
dependencies:
3083+
ansi-regex "^5.0.1"
3084+
3085+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
30703086
version "6.0.1"
30713087
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
30723088
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -3424,7 +3440,16 @@ workerpool@^9.2.0:
34243440
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.3.4.tgz#f6c92395b2141afd78e2a889e80cb338fe9fca41"
34253441
integrity sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==
34263442

3427-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
3443+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
3444+
version "7.0.0"
3445+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
3446+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
3447+
dependencies:
3448+
ansi-styles "^4.0.0"
3449+
string-width "^4.1.0"
3450+
strip-ansi "^6.0.0"
3451+
3452+
wrap-ansi@^7.0.0:
34283453
version "7.0.0"
34293454
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
34303455
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

‎samples/js/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("js")
2+
kotlin("multiplatform")
33
id("com.squareup.wire")
44
}
55

‎samples/wire-grpc-sample/server/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tasks.withType<JavaCompile>().configureEach {
1919
tasks.withType<KotlinCompile>().configureEach {
2020
compilerOptions {
2121
jvmTarget.set(JvmTarget.JVM_17)
22-
freeCompilerArgs.add("-Xjvm-default=all")
22+
freeCompilerArgs.add("-jvm-default=no-compatibility")
2323
}
2424
}
2525

‎wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WirePlugin.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import org.gradle.api.Project
2828
import org.gradle.api.artifacts.UnknownConfigurationException
2929
import org.gradle.api.tasks.SourceSet
3030
import org.gradle.api.tasks.SourceSetContainer
31-
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
3231
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
32+
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
3333
import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet
3434

3535
class WirePlugin : Plugin<Project> {
@@ -270,7 +270,7 @@ class WirePlugin : Plugin<Project> {
270270

271271
isJsOnly -> {
272272
val sourceSets =
273-
project.extensions.getByType(KotlinJsProjectExtension::class.java).sourceSets
273+
project.extensions.getByType(KotlinProjectExtension::class.java).sourceSets
274274
val sourceSet = (sourceSets.getByName("main") as DefaultKotlinSourceSet)
275275
project.dependencies.add(sourceSet.apiConfigurationName, runtimeDependency)
276276
}

‎wire-gradle-plugin/src/test/kotlin/com/squareup/wire/gradle/WirePluginTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ class WirePluginTest {
12661266
}
12671267
assertThat(buildCacheDir.exists()).isFalse()
12681268

1269-
val generatedProto = "build/generated/source/wire/com/squareup/geology/Period.kt"
1269+
val generatedProto = "build/generated/source/wire/com/squareup/geology/Period.java"
12701270

12711271
val fixtureRoot = File("src/test/projects/cache-relocation-1")
12721272
val result = fixtureGradleRunner(fixtureRoot)
@@ -1319,7 +1319,7 @@ class WirePluginTest {
13191319
}
13201320
assertThat(buildCacheDir.exists()).isFalse()
13211321

1322-
val generatedStatus = "build/generated/source/wire/com/google/rpc/Status.kt"
1322+
val generatedStatus = "build/generated/source/wire/com/google/rpc/Status.java"
13231323

13241324
val fixtureRoot = File("src/test/projects/cache-source-relocation-1")
13251325
val result = fixtureGradleRunner(fixtureRoot)

‎wire-gradle-plugin/src/test/projects/cache-relocation-1/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript {
22
dependencies {
33
classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
4-
classpath libs.pluginz.kotlin
54
}
65

76
repositories {
@@ -14,7 +13,6 @@ buildscript {
1413
}
1514

1615
apply plugin: 'application'
17-
apply plugin: 'org.jetbrains.kotlin.jvm'
1816
apply plugin: 'com.squareup.wire'
1917

2018
// The code in this test project should be identical to
@@ -35,6 +33,6 @@ dependencies {
3533
}
3634

3735
wire {
38-
kotlin {
36+
java {
3937
}
4038
}

‎wire-gradle-plugin/src/test/projects/cache-relocation-2/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript {
22
dependencies {
33
classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
4-
classpath libs.pluginz.kotlin
54
}
65

76
repositories {
@@ -14,7 +13,6 @@ buildscript {
1413
}
1514

1615
apply plugin: 'application'
17-
apply plugin: 'org.jetbrains.kotlin.jvm'
1816
apply plugin: 'com.squareup.wire'
1917

2018
// The code in this test project should be identical to
@@ -35,6 +33,6 @@ dependencies {
3533
}
3634

3735
wire {
38-
kotlin {
36+
java {
3937
}
4038
}

‎wire-gradle-plugin/src/test/projects/cache-source-relocation-1/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildscript {
22
dependencies {
33
classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
4-
classpath libs.pluginz.kotlin
54
}
65

76
repositories {
@@ -14,7 +13,6 @@ buildscript {
1413
}
1514

1615
apply plugin: 'application'
17-
apply plugin: 'org.jetbrains.kotlin.jvm'
1816
apply plugin: 'com.squareup.wire'
1917

2018
// The code in this test project should be identical to
@@ -36,6 +34,6 @@ wire {
3634
srcJar("com.google.api.grpc:proto-google-common-protos:2.57.0")
3735
include("google/rpc/status.proto")
3836
}
39-
kotlin {
37+
java {
4038
}
4139
}

0 commit comments

Comments
 (0)