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

Fix tests failing due to dev builds bundled into Gradle. Push AGP to beta.

Browse Source
This commit is contained in:
Sergey Igushkin
2017-08-11 20:22:41 +03:00
parent 6cd409d379
commit cd40968b72
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
+6 -4
View File
@@ -7,10 +7,10 @@ import org.junit.Test
import java.io.File
class KotlinAndroidGradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.0")
class KotlinAndroidWithJackGradleIT : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.3", androidGradlePluginVersion = "2.3.+")
class KotlinAndroidGradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "3.4", androidGradlePluginVersion = "2.3.0")
class KotlinAndroidWithJackGradleIT : AbstractKotlinAndroidWithJackGradleTests(gradleVersion = "3.4", androidGradlePluginVersion = "2.3.+")
class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "4.1-rc-1", androidGradlePluginVersion = "3.0.0-alpha8") {
class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = "4.1-rc-1", androidGradlePluginVersion = "3.0.0-beta1") {
@Test
fun testApplyWithFeaturePlugin() {
@@ -19,7 +19,9 @@ class KotlinAndroid30GradleIT : AbstractKotlinAndroidGradleTests(gradleVersion =
project.setupWorkingDir()
File(project.projectDir, "Lib/build.gradle").modify { text ->
// Change the applied plugin to com.android.feature
text.replace("com.android.library", "com.android.feature").apply { assert(!equals(text)) }
text.replace("com.android.library", "com.android.feature")
.replace("compileSdkVersion 22", "compileSdkVersion 26")
.apply { assert(!equals(text)) }
}
// Check that Kotlin tasks were created for both lib and feature variants:
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt
+1 -1
View File
@@ -12,6 +12,6 @@ abstract class BaseMultiGradleVersionIT : BaseGradleIT() {
companion object {
@JvmStatic
@Parameters(name = "Test with Gradle version {0}")
fun params() = listOf("2.10", "2.14.1", "3.2", "3.3", "3.4", "4.0").map { arrayOf(it) }
fun params() = listOf("2.10", "2.14.1", "3.3", "3.4", "4.0").map { arrayOf(it) }
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import java.io.File
class Kapt3Android30IT : Kapt3AndroidIT() {
override val androidGradlePluginVersion: String
get() = "3.0.0-alpha8"
get() = "3.0.0-beta1"
}
open class Kapt3AndroidIT : Kapt3BaseIT() {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+1 -1
View File
@@ -160,7 +160,7 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
@Test
fun testKotlinJsBuiltins() {
val project = Project("kotlinBuiltins", "3.2")
val project = Project("kotlinBuiltins", "4.0")
project.setupWorkingDir()
val buildGradle = File(project.projectDir, "app").getFileByName("build.gradle")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+1 -1
View File
@@ -347,7 +347,7 @@ class KotlinGradleIT: BaseGradleIT() {
@Test
fun testKotlinBuiltins() {
val project = Project("kotlinBuiltins", "3.2")
val project = Project("kotlinBuiltins", "4.0")
project.build("build") {
assertSuccessful()