Skip to content

Commit

Permalink
Update Kotlin to version 1.7.20
Browse files Browse the repository at this point in the history
(cherry picked from commit 71dd94d)
  • Loading branch information
andreas-eberle authored and gsmet committed Oct 4, 2022
1 parent 9946571 commit 4a29d46
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<aws-lambda-java-events.version>3.11.0</aws-lambda-java-events.version>
<aws-xray.version>2.11.2</aws-xray.version>
<azure-functions-java-library.version>1.4.2</azure-functions-java-library.version>
<kotlin.version>1.7.10</kotlin.version>
<kotlin.version>1.7.20</kotlin.version>
<kotlin.coroutine.version>1.6.4</kotlin.coroutine.version>
<kotlin-serialization.version>1.4.0</kotlin-serialization.version>
<kubernetes-client.version>5.12.4</kubernetes-client.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.8.1</compiler-plugin.version>
<kotlin.version>1.7.10</kotlin.version>
<kotlin.version>1.7.20</kotlin.version>
<dokka.version>1.7.10</dokka.version>
<scala.version>2.13.8</scala.version>
<scala-maven-plugin.version>4.7.1</scala-maven-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void shouldReturnMultipleOutputSourceDirectories() {

@Test
public void shouldNotFailOnProjectDependenciesWithoutMain() throws IOException {
var kotlinVersion = System.getProperty("kotlin_version", "1.7.10");
var kotlinVersion = System.getProperty("kotlin_version", "1.7.20");
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.10
kotlin_version = 1.7.20
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.10</version>
<version>1.7.20</version>
<scope>test</scope>
</dependency>

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.10-jakarta --depth 1 https://github.com/gsmet/kotlin.git target/kotlin
git clone -b v1.7.20-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

0 comments on commit 4a29d46

Please sign in to comment.