Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/compiler-options.kt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fun KotlinCommonCompilerOptions.configure(

when (this) {
is KotlinJvmCompilerOptions -> {
freeCompilerArgs.add("-Xjvm-default=all")
freeCompilerArgs.add("-jvm-default=no-compatibility")
}

is KotlinNativeCompilerOptions -> {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libraries.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ javaPoet = "1.13.0"
jetbrains-annotations = "26.0.2-1"
junit = "4.13.2"
#noinspection GradleDependency,NewerVersionAvailable compatibility with native consumers
kotlin-plugin = "2.2.20"
kotlin-plugin = "2.3.0-dev-9908"
kotlinx-coroutines = "1.10.2"
kotlinx-datetime = "0.7.1"
#noinspection NewerVersionAvailable requires KGP 2.2
Expand Down
4 changes: 2 additions & 2 deletions gradle/repositories.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
listOf(pluginManagement.repositories, dependencyResolutionManagement.repositories).forEach {
it.apply {
// Uncomment this one to use the Kotlin "dev" repository
// maven("https://redirector.kotlinlang.org/maven/dev/")
maven("https://redirector.kotlinlang.org/maven/dev/")
// Uncomment this one to use the Sonatype OSSRH snapshots repository
// maven("https://oss.sonatype.org/content/repositories/snapshots/")
maven("https://oss.sonatype.org/content/repositories/snapshots/")
// Uncomment this one to use the GradleUp repository
// maven("https://storage.googleapis.com/gradleup/m2")

Expand Down
2 changes: 1 addition & 1 deletion gradle/test.settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencyResolutionManagement {
pluginManagement {
listOf(repositories, dependencyResolutionManagement.repositories).forEach {
// Uncomment this one to use the Kotlin "dev" repository
// it.maven("https://redirector.kotlinlang.org/maven/dev/")
it.maven("https://redirector.kotlinlang.org/maven/dev/")
it.mavenCentral()
it.google()
it.maven("../../../../build/localMaven")
Expand Down
56 changes: 28 additions & 28 deletions kotlin-js-store/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ repositories {
mavenCentral()

// Uncomment this one to use the Kotlin "dev" repository
// maven("https://redirector.kotlinlang.org/maven/dev/")
maven("https://redirector.kotlinlang.org/maven/dev/")
}

configure<ApolloExtension> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ private fun buildHttpResponse(
HttpHeader(key.toString(), value.toString())
}

@Suppress("REDUNDANT_CALL_OF_CONVERSION_METHOD")
val statusCode = httpResponse.statusCode.toInt()

return Result.success(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ internal class AppleWebSocket(
nsurlSessionWebSocketTask.receiveMessageWithCompletionHandler { message, nsError ->
if (nsError != null) {
if (disposed.compareAndSet(expect = false, update = true)) {
@Suppress("REDUNDANT_CALL_OF_CONVERSION_METHOD")
val exception = if (nsError.domain == "NSPOSIXErrorDomain" && nsError.code.toLong() == ENOTCONN.toLong()) {
ApolloWebSocketClosedException(nsurlSessionWebSocketTask.closeCode.convert(), nsurlSessionWebSocketTask.closeReason?.toByteString()
?.toByteArray()?.commonToUtf8String())
Expand Down
10 changes: 5 additions & 5 deletions scripts/bump-kotlin-nightlies.main.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,21 @@ val BRANCH_NAME = "kotlin-nightlies"

fun bumpVersions() {
val kotlinVersion =
getLatestVersion("https://redirector.kotlinlang.org/maven/dev/org/jetbrains/kotlin/kotlin-stdlib/maven-metadata.xml", prefix = "2.2.20-RC")
getLatestVersion("https://redirector.kotlinlang.org/maven/dev/org/jetbrains/kotlin/kotlin-stdlib/maven-metadata.xml", prefix = "2.3.0-dev")

val useKspSnapshots = false
val kspVersion = getLatestVersion(
if (useKspSnapshots) {
"https://oss.sonatype.org/content/repositories/snapshots/com/google/devtools/ksp/com.google.devtools.ksp.gradle.plugin/maven-metadata.xml"
} else {
"https://repo1.maven.org/maven2/com/google/devtools/ksp/com.google.devtools.ksp.gradle.plugin/maven-metadata.xml"
},
prefix = "2.2.20"
}
)

File("gradle/libraries.toml").let { file ->
file.writeText(
file.readText()
.replaceVersion("kotlin-plugin", kotlinVersion)
.replaceVersion("kotlin-plugin-max", kotlinVersion)
.replaceVersion("ksp", kspVersion)
)
}
Expand Down Expand Up @@ -77,7 +75,9 @@ fun getLatestVersion(url: String, prefix: String? = null): String {
}

fun runCommand(vararg args: String): String {
println("Running command: '${args.joinToString(" ")}'")
val builder = ProcessBuilder(*args)
.redirectErrorStream(true)
.redirectError(ProcessBuilder.Redirect.INHERIT)
val process = builder.start()
val output = StringBuilder()
Expand All @@ -88,7 +88,7 @@ fun runCommand(vararg args: String): String {
}
val ret = process.waitFor()
if (ret != 0) {
throw Exception("command ${args.joinToString(" ")} failed:\n$output")
throw Exception("command ${args.joinToString(" ")} failed (ret=$ret):\n$output")
}
return output.toString().trim()
}
Expand Down
Loading
Loading