Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kotlin nightlies #6000

Draft
wants to merge 34 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3f9fc26
Add Kotlin Dev and Maven Central Snapshots repositories
Jun 28, 2024
742dea9
Bump Kotlin and KSP
Nov 29, 2024
a375dbd
Remove redundant when cases, reported as warnings
BoD Dec 10, 2024
4f6c684
Add KotlinPlatformType.jvm attribute to apolloDependencies configurat…
BoD Dec 10, 2024
6e1d23c
Bump Kotlin and KSP
Jan 30, 2025
50aefad
Bump Kotlin and KSP
Feb 1, 2025
eb181ec
Bump Kotlin and KSP
Feb 2, 2025
096bb07
Bump Kotlin and KSP
Feb 4, 2025
fd7d0fe
Bump Kotlin and KSP
Feb 5, 2025
57dce48
Bump Kotlin and KSP
Feb 6, 2025
5cc7b1a
Bump Kotlin and KSP
Feb 7, 2025
d21e439
Bump Kotlin and KSP
Feb 8, 2025
142ef51
Bump Kotlin and KSP
Feb 9, 2025
ad41023
Bump Kotlin and KSP
Feb 13, 2025
edcfd14
Bump Kotlin and KSP
Feb 14, 2025
0a5a99e
Bump Kotlin and KSP
Feb 15, 2025
4c83748
Bump Kotlin and KSP
Feb 18, 2025
b485f35
Bump Kotlin and KSP
Feb 19, 2025
4cb7e37
Bump Kotlin and KSP
Feb 20, 2025
1a6e8a1
Bump Kotlin and KSP
Feb 22, 2025
e62c46e
Bump Kotlin and KSP
Feb 25, 2025
44be176
Bump Kotlin and KSP
Feb 27, 2025
bf40d06
Bump Kotlin and KSP
Feb 28, 2025
d65bd97
Bump Kotlin and KSP
Mar 1, 2025
157b09f
Bump Kotlin and KSP
Mar 2, 2025
df525a4
Bump Kotlin and KSP
Mar 4, 2025
0ac8498
Bump Kotlin and KSP
Mar 5, 2025
73c3676
Bump Kotlin and KSP
Mar 6, 2025
7807555
Bump Kotlin and KSP
Mar 7, 2025
692b491
Bump Kotlin and KSP
Mar 11, 2025
5a11c54
Bump Kotlin and KSP
Mar 14, 2025
af0ff08
Bump Kotlin and KSP
Mar 18, 2025
61400ce
Bump Kotlin and KSP
Mar 20, 2025
5f43abf
Bump Kotlin and KSP
Mar 21, 2025
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
6 changes: 3 additions & 3 deletions gradle/libraries.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,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.21-RC-224"
kotlin-plugin-max = "2.1.21-RC-224"
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.10-1.0.32-SNAPSHOT"
ktor = "3.0.0"
moshix = "0.14.1"
node-fetch = "2.7.0"
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 { 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 {
Expand Down
8 changes: 6 additions & 2 deletions intellij-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
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
Expand All @@ -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 {
Expand All @@ -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"))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ApolloExtension> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -32,4 +31,4 @@ fun Any?.toJsonElement(): JsonElement = when (this) {
is String -> JsonPrimitive(this)
null -> JsonNull
else -> error("cannot convert $this to JsonElement")
}
}
2 changes: 1 addition & 1 deletion tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ val ciBuild = tasks.register("ciBuild") {
}
}

apolloRoot(ciBuild)
apolloRoot(ciBuild)
Loading