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

Upgrade Kotlin to 1.8.22 #33972

Merged
merged 1 commit into from
Jun 14, 2023
Merged

Upgrade Kotlin to 1.8.22 #33972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<aws-xray.version>2.14.0</aws-xray.version>
<azure-functions-java-library.version>2.2.0</azure-functions-java-library.version>
<azure-functions-java-spi.version>1.0.0</azure-functions-java-spi.version>
<kotlin.version>1.8.21</kotlin.version>
<kotlin.version>1.8.22</kotlin.version>
<kotlin.coroutine.version>1.7.1</kotlin.coroutine.version>
<azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
<kotlin.coroutine.version>1.6.4</kotlin.coroutine.version>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<!-- These properties are needed in order for them to be resolvable by the generated projects -->
<!-- Quarkus uses jboss-parent and it comes with 3.8.1-jboss-1, we don't want that in the templates -->
<compiler-plugin.version>3.11.0</compiler-plugin.version>
<kotlin.version>1.8.21</kotlin.version>
<kotlin.version>1.8.22</kotlin.version>
<dokka.version>1.8.10</dokka.version>
<scala.version>2.13.8</scala.version>
<scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion ...s/gradle/gradle-application-plugin/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void shouldReturnMultipleOutputSourceDirectories() {

@Test
public void shouldNotFailOnProjectDependenciesWithoutMain(@TempDir Path testProjectDir) throws IOException {
var kotlinVersion = System.getProperty("kotlin_version", "1.8.20");
var kotlinVersion = System.getProperty("kotlin_version", "1.8.22");
var settingFile = testProjectDir.resolve("settings.gradle.kts");
var mppProjectDir = testProjectDir.resolve("mpp");
var quarkusProjectDir = testProjectDir.resolve("quarkus");
Expand Down
1 change: 1 addition & 0 deletions devtools/gradle/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[versions]
plugin-publish = "1.2.0"

# updating Kotlin here makes QuarkusPluginTest > shouldNotFailOnProjectDependenciesWithoutMain(Path) fail
kotlin = "1.8.10"
Comment on lines +4 to 5
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@snazy would you have an idea as to why we cannot upgrade Kotlin here?

We end up with:

Cannot access 'org.jetbrains.kotlin.gradle.plugin.KotlinTargetsContainerWithPresets' which is a supertype of 'org.jetbrains.kotlin.gradle.dsl.KotlinTargetContainerWithPresetFunctions'. Check your module classpath for missing or conflicting dependencies

I thought that maybe we had conflicting Kotlin versions but I couldn't find anything tied to 1.8.10. Or maybe Gradle comes with Kotlin 1.8.10?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, I think that Gradle comes with that version. It should however only affect Quarkus' Gradle plugin itself, not the application code.

smallrye-config = "3.2.1"

Expand Down
2 changes: 1 addition & 1 deletion independent-projects/arc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<!-- test versions -->
<version.assertj>3.24.2</version.assertj>
<version.junit5>5.9.3</version.junit5>
<version.kotlin>1.8.21</version.kotlin>
<version.kotlin>1.8.22</version.kotlin>
<version.kotlin-coroutines>1.7.1</version.kotlin-coroutines>
<version.mockito>5.3.1</version.mockito>
<!-- TCK versions -->
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "1.8.21"
kotlin("plugin.allopen") version "1.8.21"
kotlin("jvm") version "1.8.22"
kotlin("plugin.allopen") version "1.8.22"
id("io.quarkus")
}

Expand Down