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

Update Kotlin to version 1.9.21, Mockito to 5.7.0 #36892

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Update Kotlin to version 1.9.21, Mockito to 5.7.0 #36892

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 @@ -158,7 +158,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.9.10</kotlin.version>
<kotlin.version>1.9.21</kotlin.version>
<kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
<azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
<kotlin-serialization.version>1.6.0</kotlin-serialization.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 @@ -20,7 +20,7 @@

<!-- These properties are needed in order for them to be resolvable by the generated projects -->
<compiler-plugin.version>3.11.0</compiler-plugin.version>
<kotlin.version>1.9.10</kotlin.version>
<kotlin.version>1.9.21</kotlin.version>
<dokka.version>1.9.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 @@ -105,7 +105,7 @@ public void shouldReturnMultipleOutputSourceDirectories() {

@Test
public void shouldNotFailOnProjectDependenciesWithoutMain(@TempDir Path testProjectDir) throws IOException {
var kotlinVersion = System.getProperty("kotlin_version", "1.9.10");
var kotlinVersion = System.getProperty("kotlin_version", "1.9.21");
var settingFile = testProjectDir.resolve("settings.gradle.kts");
var mppProjectDir = testProjectDir.resolve("mpp");
var quarkusProjectDir = testProjectDir.resolve("quarkus");
Expand Down
4 changes: 2 additions & 2 deletions independent-projects/arc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
<!-- test versions -->
<version.assertj>3.24.2</version.assertj>
<version.junit5>5.10.0</version.junit5>
<version.kotlin>1.9.10</version.kotlin>
<version.kotlin>1.9.21</version.kotlin>
<version.kotlin-coroutines>1.7.3</version.kotlin-coroutines>
<version.mockito>5.4.0</version.mockito>
<version.mockito>5.7.0</version.mockito>
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason why you also upgraded Mockito in this PR?

If so, it would be better to mention it in the PR title too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The newest version also works with Kotlin 1.9.20. So it seemed reasonable to upgrade it too. I will change the title. Thanks for the hint!

<!-- TCK versions -->
<version.arquillian>1.7.0.Final</version.arquillian>
<version.atinject-tck>2.0.1</version.atinject-tck>
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.9.10"
kotlin("plugin.allopen") version "1.9.10"
kotlin("jvm") version "1.9.21"
kotlin("plugin.allopen") version "1.9.21"
id("io.quarkus")
}

Expand Down
Loading