diff --git a/gradle/libraries.toml b/gradle/libraries.toml index 8f2642f008e..ddcd9c16eb3 100644 --- a/gradle/libraries.toml +++ b/gradle/libraries.toml @@ -28,12 +28,12 @@ javaPoet = "1.13.0" jetbrains-annotations = "24.0.1" junit = "4.13.2" kotlin-plugin-min = "1.9.0" -kotlin-plugin = "2.1.10" -kotlin-plugin-max = "2.1.10" +kotlin-plugin = "2.1.20-RC-81" +kotlin-plugin-max = "2.1.20-RC-81" kotlinx-coroutines = "1.9.0" kotlinx-datetime = "0.5.0" kotlinx-serialization-runtime = "1.6.2" -ksp = "2.1.10-1.0.29" +ksp = "2.1.0-1.0.30-SNAPSHOT" ktor = "3.0.0" moshix = "0.14.1" node-fetch = "2.7.0" diff --git a/gradle/repositories.gradle.kts b/gradle/repositories.gradle.kts index b43df85be00..77df0b433d4 100644 --- a/gradle/repositories.gradle.kts +++ b/gradle/repositories.gradle.kts @@ -1,9 +1,9 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositories).forEach { it.apply { // Uncomment this one to use the Kotlin "dev" repository - // maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") } + maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") } // Uncomment this one to use the Sonatype OSSRH snapshots repository - // maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") } + maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") } mavenCentral() exclusiveContent { diff --git a/intellij-plugin/build.gradle.kts b/intellij-plugin/build.gradle.kts index 2fc710f0382..3fbf8134fa9 100644 --- a/intellij-plugin/build.gradle.kts +++ b/intellij-plugin/build.gradle.kts @@ -6,6 +6,7 @@ import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLeve import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.INTERNAL_API_USAGES import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.INVALID_PLUGIN import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.PLUGIN_STRUCTURE_WARNINGS +import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import java.net.URI import java.text.SimpleDateFormat import java.util.Date @@ -27,9 +28,9 @@ commonSetup() // XXX: this should use the settings repositories instead repositories { // Uncomment this one to use the Kotlin "dev" repository - // maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") } + maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") } // Uncomment this one to use the Sonatype OSSRH snapshots repository - // maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") } + maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") } mavenCentral() intellijPlatform { @@ -55,6 +56,9 @@ kotlin { } val apolloDependencies = configurations.create("apolloDependencies").apply { + attributes { + attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm) + } listOf(":apollo-annotations", ":apollo-api", ":apollo-runtime").forEach { dependencies.add(project.dependencies.project(it, "jvmApiElements")) } diff --git a/libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts b/libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts index ef5d73c340a..af4ab2aa7a4 100644 --- a/libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts +++ b/libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts @@ -23,7 +23,7 @@ repositories { } mavenCentral() // Uncomment this one to use the Kotlin "dev" repository - // maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") } + maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") } } configure { diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/RegisterOperations.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/RegisterOperations.kt index 895e29e5dd0..8616c4cd104 100644 --- a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/RegisterOperations.kt +++ b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/RegisterOperations.kt @@ -51,7 +51,6 @@ private fun GQLSelection.score(): String { is GQLField -> "a$name" is GQLFragmentSpread -> "b$name" is GQLInlineFragment -> "c" // apollo-tooling doesn't sort inline fragments - else -> error("Cannot sort Selection '$this'") } } diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/serialization.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/serialization.kt index 0e97cf66bbc..7f18038d1dc 100644 --- a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/serialization.kt +++ b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/serialization.kt @@ -21,7 +21,6 @@ internal fun JsonElement.toAny(): Any? = when (this) { else -> booleanOrNull ?: intOrNull ?: longOrNull ?: doubleOrNull ?: error("cannot decode $this") } } - else -> error("cannot convert $this to Any") } fun Any?.toJsonElement(): JsonElement = when (this) { @@ -32,4 +31,4 @@ fun Any?.toJsonElement(): JsonElement = when (this) { is String -> JsonPrimitive(this) null -> JsonNull else -> error("cannot convert $this to JsonElement") -} \ No newline at end of file +} diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts index cf85aaad970..15ee601e6a8 100644 --- a/tests/build.gradle.kts +++ b/tests/build.gradle.kts @@ -13,4 +13,4 @@ val ciBuild = tasks.register("ciBuild") { } } -apolloRoot(ciBuild) \ No newline at end of file +apolloRoot(ciBuild)