Fix AGP version checks in kapt android tests
This commit is contained in:
+12
-2
@@ -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:
|
||||||
@@ -170,4 +179,5 @@ open class Kapt3AndroidIT : Kapt3BaseIT() {
|
|||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user