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

Fix AGP version checks in kapt android tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-11-01 00:38:31 +03:00
parent 6782d8c5c8
commit 4110eb3587
1 changed files with 23 additions and 13 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
+12 -2
View File
@@ -41,7 +41,11 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
assertKaptSuccessful() assertKaptSuccessful()
assertFileExists("app/build/generated/source/kapt/debug/org/example/kotlin/butterknife/SimpleActivity\$\$ViewBinder.java") assertFileExists("app/build/generated/source/kapt/debug/org/example/kotlin/butterknife/SimpleActivity\$\$ViewBinder.java")
val butterknifeJavaClassesDir = "app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/example/kotlin/butterknife/" val butterknifeJavaClassesDir =
if (androidGradlePluginVersion >= AGPVersion.v3_2_0)
"app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/example/kotlin/butterknife/"
else
"app/build/intermediates/classes/debug/org/example/kotlin/butterknife/"
assertFileExists(butterknifeJavaClassesDir + "SimpleActivity\$\$ViewBinder.class") assertFileExists(butterknifeJavaClassesDir + "SimpleActivity\$\$ViewBinder.class")
@@ -64,7 +68,11 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
assertFileExists("app/build/generated/source/kapt/debug/com/example/dagger/kotlin/DaggerApplicationComponent.java") assertFileExists("app/build/generated/source/kapt/debug/com/example/dagger/kotlin/DaggerApplicationComponent.java")
assertFileExists("app/build/generated/source/kapt/debug/com/example/dagger/kotlin/ui/HomeActivity_MembersInjector.java") assertFileExists("app/build/generated/source/kapt/debug/com/example/dagger/kotlin/ui/HomeActivity_MembersInjector.java")
val daggerJavaClassesDir = "app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/dagger/kotlin/" val daggerJavaClassesDir =
if (androidGradlePluginVersion >= AGPVersion.v3_2_0)
"app/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/example/dagger/kotlin/"
else
"app/build/intermediates/classes/debug/com/example/dagger/kotlin/"
assertFileExists(daggerJavaClassesDir + "DaggerApplicationComponent.class") assertFileExists(daggerJavaClassesDir + "DaggerApplicationComponent.class")
@@ -152,6 +160,7 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
} }
private fun setupDataBinding(project: Project, projectName: String?) { private fun setupDataBinding(project: Project, projectName: String?) {
if (androidGradlePluginVersion >= AGPVersion.v3_2_0) {
project.setupWorkingDir() project.setupWorkingDir()
// With new AGP, there's no need in the Databinding kapt dependency: // With new AGP, there's no need in the Databinding kapt dependency:
@@ -171,3 +180,4 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
) )
} }
} }
}