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

Bump to Kotlin 1.8.10 #30835

Merged
merged 1 commit into from
Feb 4, 2023
Merged
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
2 changes: 1 addition & 1 deletion bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<aws-xray.version>2.13.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.7.22</kotlin.version>
<kotlin.version>1.8.10</kotlin.version>
<kotlin.coroutine.version>1.6.4</kotlin.coroutine.version>
<kotlin-serialization.version>1.4.1</kotlin-serialization.version>
<dekorate.version>3.3.1</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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.10.1</compiler-plugin.version>
<kotlin.version>1.7.22</kotlin.version>
<kotlin.version>1.8.10</kotlin.version>
<dokka.version>1.7.20</dokka.version>
<scala.version>2.13.8</scala.version>
<scala-maven-plugin.version>4.8.0</scala-maven-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void shouldReturnMultipleOutputSourceDirectories() {

@Test
public void shouldNotFailOnProjectDependenciesWithoutMain() throws IOException {
var kotlinVersion = System.getProperty("kotlin_version", "1.7.22");
var kotlinVersion = System.getProperty("kotlin_version", "1.8.10");
var settingFile = testProjectDir.resolve("settings.gradle.kts");
var mppProjectDir = testProjectDir.resolve("mpp");
var quarkusProjectDir = testProjectDir.resolve("quarkus");
Expand Down
2 changes: 1 addition & 1 deletion devtools/gradle/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = 999-SNAPSHOT
kotlin_version = 1.7.22
kotlin_version = 1.8.10
2 changes: 1 addition & 1 deletion independent-projects/arc/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>1.7.22</version>
<version>1.8.10</version>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "1.7.22"
kotlin("plugin.allopen") version "1.7.22"
kotlin("jvm") version "1.8.10"
kotlin("plugin.allopen") version "1.8.10"
id("io.quarkus")
}

Expand Down
2 changes: 1 addition & 1 deletion jakarta/transform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [ "${REWRITE_OFFLINE-false}" != "true" ]; then
# Build Kotlin Maven Plugin to allow skipping main compilation
# (skipping test compilation is supported but not main)
rm -rf target/kotlin
git clone -b v1.7.22-jakarta --depth 1 https://github.com/gsmet/kotlin.git target/kotlin
git clone -b v1.8.10-jakarta --depth 1 https://github.com/gsmet/kotlin.git target/kotlin
pushd target/kotlin/libraries/tools/kotlin-maven-plugin
mvn -B clean install -DskipTests -DskipITs
popd
Expand Down