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

Run tests against Gradle 5.3 RC2

Browse Source
This commit is contained in:
Sergey Igushkin
2019-03-04 22:09:56 +03:00
parent 17df1ce096
commit eedb8b0ae1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+1 -1
View File
@@ -75,7 +75,7 @@ tasks.register<Test>("testsFromJps") {
} }
tasks.register<Test>("testAdvanceGradleVersion") { tasks.register<Test>("testAdvanceGradleVersion") {
val gradleVersionForTests = "5.2" val gradleVersionForTests = "5.3-rc-2"
systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests) systemProperty("kotlin.gradle.version.for.tests", gradleVersionForTests)
dependsOn(tasks.getByName("test").dependsOn) dependsOn(tasks.getByName("test").dependsOn)
exclude(jpsIncrementalTestsClass) exclude(jpsIncrementalTestsClass)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+8 -1
View File
@@ -144,7 +144,14 @@ abstract class BaseGradleIT {
.apply { .apply {
File(BaseGradleIT.resourcesRootFile, "GradleWrapper").copyRecursively(this) File(BaseGradleIT.resourcesRootFile, "GradleWrapper").copyRecursively(this)
val wrapperProperties = File(this, "gradle/wrapper/gradle-wrapper.properties") val wrapperProperties = File(this, "gradle/wrapper/gradle-wrapper.properties")
wrapperProperties.modify { it.replace("<GRADLE_WRAPPER_VERSION>", version) } val isGradleVerisonSnapshot = version.endsWith("+0000")
if (!isGradleVerisonSnapshot) {
wrapperProperties.modify { it.replace("<GRADLE_WRAPPER_VERSION>", version) }
} else {
wrapperProperties.modify {
it.replace("distributions/gradle-<GRADLE_WRAPPER_VERSION>", "distributions-snapshots/gradle-$version")
}
}
} }
private val runnerGradleVersion = System.getProperty("runnerGradleVersion") private val runnerGradleVersion = System.getProperty("runnerGradleVersion")