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 9 commits into
base: main
Choose a base branch
from
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
6 changes: 3 additions & 3 deletions gradle/libraries.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0"
kotlin-plugin-max = "2.1.0"
kotlin-plugin = "2.1.20-Beta2-50"
kotlin-plugin-max = "2.1.20-Beta2-50"
kotlinx-coroutines = "1.9.0"
kotlinx-datetime = "0.5.0"
kotlinx-serialization-runtime = "1.6.2"
ksp = "2.1.0-1.0.29"
ksp = "2.1.0-1.0.30-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.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
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 @@ -133,9 +133,9 @@ color-name@~1.1.4:
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==

debug@^4.3.5:
version "4.3.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
version "4.4.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
dependencies:
ms "^2.1.3"

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")
}
}
6 changes: 5 additions & 1 deletion tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ buildscript {
* This duplicates the repositories in repositories.gradle.kts but I haven't found a way to make it work otherwise
* See https://github.com/gradle/gradle/issues/32045
*/
// Uncomment this one to use the Kotlin "dev" repository
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/") }
mavenCentral()
google()
gradlePluginPortal()
Expand All @@ -23,4 +27,4 @@ val ciBuild = tasks.register("ciBuild") {
}
}

apolloRoot(ciBuild)
apolloRoot(ciBuild)
Loading