azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Test] Fix various tests according to switching to kotlin 1.5

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-01-15 12:04:05 +03:00
parent 64100eec07
commit 4f8b12c96f
9 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+2 -2
View File
@@ -6,14 +6,14 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo
/**
* Allow using declarations only from the specified version of bundled libraries
* Possible values: "1.2 (DEPRECATED)", "1.3", "1.4", "1.5 (EXPERIMENTAL)", "1.6 (EXPERIMENTAL)"
* Possible values: "1.3 (DEPRECATED)", "1.4", "1.5", "1.6 (EXPERIMENTAL)"
* Default value: null
*/
var apiVersion: kotlin.String?
/**
* Provide source compatibility with the specified version of Kotlin
* Possible values: "1.2 (DEPRECATED)", "1.3", "1.4", "1.5 (EXPERIMENTAL)", "1.6 (EXPERIMENTAL)"
* Possible values: "1.3 (DEPRECATED)", "1.4", "1.5", "1.6 (EXPERIMENTAL)"
* Default value: null
*/
var languageVersion: kotlin.String?
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+6 -6
View File
@@ -467,18 +467,18 @@ class KotlinGradleIT : BaseGradleIT() {
}
// check the arguments are always passed if specified explicitly
updateBuildGradle("1.2", "1.2")
updateBuildGradle("1.4", "1.4")
project.build("clean", "compileKotlin") {
assertSuccessful()
assertContains("-language-version 1.2")
assertContains("-api-version 1.2")
assertContains("-language-version 1.4")
assertContains("-api-version 1.4")
}
updateBuildGradle("1.3", "1.3")
updateBuildGradle("1.5", "1.5")
project.build("clean", "compileKotlin") {
assertSuccessful()
assertContains("-language-version 1.3")
assertContains("-api-version 1.3")
assertContains("-language-version 1.5")
assertContains("-api-version 1.5")
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt
+2 -2
View File
@@ -12,7 +12,7 @@ class UpToDateIT : BaseGradleIT() {
testMutations(
*propertyMutationChain(
"compileKotlin.kotlinOptions.languageVersion",
"null", "'1.3'", "'1.2'", "null"
"null", "'1.5'", "'1.4'", "null"
)
)
}
@@ -22,7 +22,7 @@ class UpToDateIT : BaseGradleIT() {
testMutations(
*propertyMutationChain(
"compileKotlin.kotlinOptions.apiVersion",
"null", "'1.3'", "'1.2'", "null"
"null", "'1.5'", "'1.4'", "null"
)
)
}