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

Test KAPT with AGP 3.1.0

Browse Source
This commit is contained in:
Alexey Tsvetkov
2019-01-15 00:09:12 +03:00
parent d1cd98cf8b
commit c59c5361d1
1 changed files with 23 additions and 7 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/Kapt3AndroidIT.kt
+23 -7
View File
@@ -19,6 +19,15 @@ open class Kapt3Android32IT : Kapt3AndroidIT() {
get() = GradleVersionRequired.AtLeast("4.6") get() = GradleVersionRequired.AtLeast("4.6")
} }
class Kapt3Android31IT : Kapt3AndroidIT() {
override val androidGradlePluginVersion: AGPVersion
get() = AGPVersion.v3_1_0
// there is a weird validation exception in testICWithAnonymousClasses with 5.0 todo: fix it
override val defaultGradleVersion: GradleVersionRequired
get() = GradleVersionRequired.InRange("4.4", "4.10.2")
}
open class Kapt3AndroidIT : Kapt3BaseIT() { open class Kapt3AndroidIT : Kapt3BaseIT() {
protected open val androidGradlePluginVersion: AGPVersion protected open val androidGradlePluginVersion: AGPVersion
get() = AGPVersion.v3_0_0 get() = AGPVersion.v3_0_0
@@ -150,13 +159,20 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
assertKaptSuccessful() assertKaptSuccessful()
assertFileExists("app/build/generated/source/kapt/debug/com/example/databinding/BR.java") assertFileExists("app/build/generated/source/kapt/debug/com/example/databinding/BR.java")
if (output.contains("-Aandroid.databinding.enableV2=1")) { when {
// databinding compiler v2 was introduced in AGP 3.1.0, was enabled by default in AGP 3.2.0 output.contains("-Aandroid.databinding.enableV2=1") -> {
assertFileExists("library/build/generated/source/kapt/debugAndroidTest/android/databinding/DataBinderMapperImpl.java") // databinding compiler v2 was introduced in AGP 3.1.0, was enabled by default in AGP 3.2.0
assertFileExists("app/build/generated/source/kapt/debug/com/example/databinding/databinding/ActivityTestBindingImpl.java") assertFileExists("library/build/generated/source/kapt/debugAndroidTest/android/databinding/DataBinderMapperImpl.java")
} else { assertFileExists("app/build/generated/source/kapt/debug/com/example/databinding/databinding/ActivityTestBindingImpl.java")
assertFileExists("library/build/generated/source/kapt/debugAndroidTest/android/databinding/DataBinderMapper.java") }
assertFileExists("app/build/generated/source/kapt/debug/com/example/databinding/databinding/ActivityTestBinding.java") androidGradlePluginVersion == AGPVersion.v3_1_0 -> {
assertFileExists("library/build/generated/source/kapt/debugAndroidTest/android/databinding/DataBinderMapperImpl.java")
assertFileExists("app/build/generated/source/kapt/debug/com/example/databinding/databinding/ActivityTestBinding.java")
}
else -> {
assertFileExists("library/build/generated/source/kapt/debugAndroidTest/android/databinding/DataBinderMapper.java")
assertFileExists("app/build/generated/source/kapt/debug/com/example/databinding/databinding/ActivityTestBinding.java")
}
} }
// KT-23866 // KT-23866