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.

Sign up for GitHub

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

Bump Kotlin to 2.1.20 #6431

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Bump Kotlin to 2.1.20 #6431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
857190a
Bump Kotlin to 2.1.20
BoD Mar 21, 2025
4587f31
Remove redundant when cases, reported as warnings
BoD Dec 10, 2024
22c81b2
Add KotlinPlatformType.jvm attribute to apolloDependencies configurat…
BoD Dec 10, 2024
2deae3d
Give more RAM to the plugin verifier
BoD Mar 21, 2025
265589e
Re enable COMPATIBILITY_PROBLEMS in the plugin verifier
BoD Mar 21, 2025
1c83e02
Try to give more memory to the plugin verifier
BoD Mar 21, 2025
2c0ce51
Try to give even more memory to the plugin verifier. Also lower the l…
BoD Mar 21, 2025
874ae66
Try using Java 24
BoD Mar 21, 2025
1ca92ad
Try using Java 23
BoD 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
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
with:
distribution: 'temurin'
java-version: 17
java-version: 23

# Set environment variables
- name: Export Properties
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
# Run Verify Plugin task and IntelliJ Plugin Verifier tool
- name: Run Plugin Verification tasks
env:
JAVA_TOOL_OPTIONS: -Dlogback.configurationFile=${{ github.workspace }}/intellij-plugin/logback.xml
JAVA_TOOL_OPTIONS: -Xmx4g -Dlogback.configurationFile=${{ github.workspace }}/intellij-plugin/logback.xml
run: ./gradlew :intellij-plugin:verifyPlugin -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}

# Collect Plugin Verifier Result
Expand Down
6 changes: 3 additions & 3 deletions gradle/libraries.toml
View file
Open in desktop
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.20"
kotlin-plugin-max = "2.1.20"
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.20-1.0.31"
ktor = "3.0.0"
moshix = "0.14.1"
node-fetch = "2.7.0"
Expand Down
8 changes: 6 additions & 2 deletions intellij-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.jetbrains.changelog.markdownToHTML
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS
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 Down Expand Up @@ -55,6 +57,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 Expand Up @@ -243,8 +248,7 @@ intellijPlatform {
}
failureLevel.set(
setOf(
// TODO: Temporarily disabled due to https://platform.jetbrains.com/t/plugin-verifier-fails-with-plugin-com-intellij-modules-json-not-declared-as-a-plugin-dependency/580
// COMPATIBILITY_PROBLEMS,
COMPATIBILITY_PROBLEMS,
INTERNAL_API_USAGES,
INVALID_PLUGIN,
PLUGIN_STRUCTURE_WARNINGS,
Expand Down
2 changes: 1 addition & 1 deletion intellij-plugin/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</encoder>
</appender>

<root level="DEBUG">
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>

Expand Down
1 change: 0 additions & 1 deletion ...ies/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/RegisterOperations.kt
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo/tooling/serialization.kt
View file
Open in desktop
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")
}
}
Loading