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

Update android tools versions in Gradle plugin tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-06-27 04:26:14 +03:00
parent 357518be0d
commit efeea9d7d4
2 changed files with 16 additions and 14 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
+1 -1
View File
@@ -14,7 +14,7 @@ class KotlinAndroidGradleIT :
AbstractKotlinAndroidGradleTests(gradleVersion = GradleVersionRequired.AtLeast("3.4"), androidGradlePluginVersion = "2.3.0") AbstractKotlinAndroidGradleTests(gradleVersion = GradleVersionRequired.AtLeast("3.4"), androidGradlePluginVersion = "2.3.0")
// TODO If we there is a way to fetch the latest Android plugin version, test against the latest version // TODO If we there is a way to fetch the latest Android plugin version, test against the latest version
class KotlinAndroid32GradleIT : KotlinAndroid3GradleIT(GradleVersionRequired.AtLeast("4.6"), "3.2.0-alpha15") { class KotlinAndroid32GradleIT : KotlinAndroid3GradleIT(GradleVersionRequired.AtLeast("4.6"), "3.2.0-beta01") {
@Test @Test
fun testKaptUsingApOptionProvidersAsNestedInputOutput() = with(Project("AndroidProject", gradleVersion)) { fun testKaptUsingApOptionProvidersAsNestedInputOutput() = with(Project("AndroidProject", gradleVersion)) {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt
+15 -13
View File
@@ -4,20 +4,23 @@ import org.jetbrains.kotlin.gradle.util.isLegacyAndroidGradleVersion
import org.jetbrains.kotlin.gradle.util.modify import org.jetbrains.kotlin.gradle.util.modify
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import org.junit.Test import org.junit.Test
import java.io.File
class Kapt3Android30IT : Kapt3AndroidIT() { class Kapt3Android32IT : Kapt3AndroidIT() {
override val androidGradlePluginVersion: String override val androidGradlePluginVersion: String
get() = "3.2.0-alpha18" get() = "3.2.0-beta01"
override val gradleVersion: GradleVersionRequired
get() = GradleVersionRequired.AtLeast("4.6")
} }
open class Kapt3AndroidIT : Kapt3BaseIT() { open class Kapt3AndroidIT : Kapt3BaseIT() {
companion object {
private val GRADLE_VERSION = GradleVersionRequired.AtLeast("4.6")
}
protected open val androidGradlePluginVersion: String protected open val androidGradlePluginVersion: String
get() = "2.3.0" get() = "2.3.0"
protected open val gradleVersion: GradleVersionRequired
get() = GradleVersionRequired.AtLeast("4.1")
private fun androidBuildOptions() = private fun androidBuildOptions() =
BuildOptions( BuildOptions(
withDaemon = true, withDaemon = true,
@@ -30,7 +33,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
@Test @Test
fun testButterKnife() { fun testButterKnife() {
val project = Project("android-butterknife", GRADLE_VERSION, directoryPrefix = "kapt2") val project = Project("android-butterknife", gradleVersion, directoryPrefix = "kapt2")
val options = androidBuildOptions() val options = androidBuildOptions()
project.build("assembleDebug", options = options) { project.build("assembleDebug", options = options) {
@@ -62,7 +65,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
@Test @Test
fun testDagger() { fun testDagger() {
val project = Project("android-dagger", GRADLE_VERSION, directoryPrefix = "kapt2") val project = Project("android-dagger", gradleVersion, directoryPrefix = "kapt2")
val options = androidBuildOptions() val options = androidBuildOptions()
project.build("assembleDebug", options = options) { project.build("assembleDebug", options = options) {
@@ -89,7 +92,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
@Test @Test
fun testKt15001() { fun testKt15001() {
val project = Project("kt15001", GRADLE_VERSION, directoryPrefix = "kapt2") val project = Project("kt15001", gradleVersion, directoryPrefix = "kapt2")
val options = androidBuildOptions() val options = androidBuildOptions()
project.build("assembleDebug", options = options) { project.build("assembleDebug", options = options) {
@@ -100,7 +103,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
@Test @Test
fun testDbFlow() { fun testDbFlow() {
val project = Project("android-dbflow", GRADLE_VERSION, directoryPrefix = "kapt2") val project = Project("android-dbflow", gradleVersion, directoryPrefix = "kapt2")
val options = androidBuildOptions() val options = androidBuildOptions()
project.build("assembleDebug", options = options) { project.build("assembleDebug", options = options) {
@@ -115,7 +118,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
@Test @Test
fun testRealm() { fun testRealm() {
val project = Project("android-realm", GRADLE_VERSION, directoryPrefix = "kapt2") val project = Project("android-realm", gradleVersion, directoryPrefix = "kapt2")
val options = androidBuildOptions() val options = androidBuildOptions()
project.build("assembleDebug", options = options) { project.build("assembleDebug", options = options) {
@@ -130,10 +133,9 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
@Test @Test
open fun testDatabinding() { open fun testDatabinding() {
val project = Project("android-databinding", GRADLE_VERSION, directoryPrefix = "kapt2") val project = Project("android-databinding", gradleVersion, directoryPrefix = "kapt2")
val options = androidBuildOptions() val options = androidBuildOptions()
if (!isLegacyAndroidGradleVersion(androidGradlePluginVersion)) { if (!isLegacyAndroidGradleVersion(androidGradlePluginVersion)) {
project.setupWorkingDir() project.setupWorkingDir()