Skip to content

Update Kotlin version to 1.9.22 #181

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

Merged
merged 1 commit into from
Jan 31, 2024
Merged

Update Kotlin version to 1.9.22 #181

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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]

kotlin = "1.8.20"
kotlin = "1.9.22"

javaDiffUtils = "4.12"
junit = "5.9.2"
Expand Down
2 changes: 1 addition & 1 deletion src/functionalTest/kotlin/kotlinx/validation/api/TestDsl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import org.intellij.lang.annotations.Language
public val API_DIR: String = ApiValidationExtension().apiDumpDirectory

internal fun BaseKotlinGradleTest.test(
gradleVersion: String = "7.4.2",
gradleVersion: String = "8.5",
Copy link
Member

@qwwdfsad qwwdfsad Jan 30, 2024

Choose a reason for hiding this comment

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

Do we change the minimal supported Gradle version for BCV?
If so, worth noting it in README

Copy link
Collaborator Author

@fzhinkin fzhinkin Jan 30, 2024

Choose a reason for hiding this comment

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

I'll double check it. But here the version was updated only to make tests work with 1.9.22 (as I mentioned elsewhere, that version leaks into functional tests and I don't know what to do with that).

Copy link
Collaborator Author

@fzhinkin fzhinkin Jan 31, 2024

Choose a reason for hiding this comment

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

I don't think we ever mentioned it explicitly, but the minimum supported Gradle version is 6.0 and after updating to Kotlin 1.9.22 the plugin still works with it.

Copy link
Member

@qwwdfsad qwwdfsad Jan 31, 2024

Choose a reason for hiding this comment

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

Thanks!

injectPluginClasspath: Boolean = true,
fn: BaseKotlinScope.() -> Unit
): GradleRunner {
Expand Down
6 changes: 6 additions & 0 deletions src/functionalTest/resources/examples/gradle/base/multiplatformWithJvmTargets.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ kotlin {
testRuns["test"].executionTask.configure {
useJUnit()
}
attributes {
Copy link
Collaborator Author

@fzhinkin fzhinkin Jan 30, 2024

Choose a reason for hiding this comment

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

It seems like functionalTests always use the same Kotlin version as the projects, so after updating to 1.9.22 we need to declare build variants here. Otherwise, the configuration won't succeed.

attribute(Attribute.of("variant", String::class.java), "a")
}
}
jvm("anotherJvm") {
compilations.all {
Expand All @@ -29,6 +32,9 @@ kotlin {
testRuns["test"].executionTask.configure {
useJUnit()
}
attributes {
attribute(Attribute.of("variant", String::class.java), "b")
}
}
}
sourceSets {
Expand Down