Skip to content

Commit cfb0a11

Browse files
author
Marcel Schnelle
committed
Validate AGP 3.2.0-alpha12+13 & move to proper plugin order in tests
1 parent e2d0d99 commit cfb0a11

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

android-junit5-tests/src/test/groovy/de/mannodermaus/gradle/plugins/junit5/FunctionalSpec.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,11 @@ class FunctionalSpec extends Specification {
412412
// can't be resolved within the offline-only virtual project execution
413413
lint.enabled false
414414
415+
// Required by AAPT2
416+
repositories {
417+
google()
418+
}
419+
415420
dependencies {
416421
testImplementation files(${
417422
ClasspathSplitter.splitClasspath(testCompileClasspath)

android-junit5-tests/src/test/groovy/de/mannodermaus/gradle/plugins/junit5/util/TestProjectFactory.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ class TestProjectFactory {
118118
break
119119
}
120120

121-
if (applyJunit5Plugin) {
122-
project.apply plugin: "de.mannodermaus.android-junit5"
123-
}
124-
125121
if (applyJacocoPlugin) {
126122
project.apply plugin: "jacoco"
127123
}
@@ -130,6 +126,10 @@ class TestProjectFactory {
130126
project.apply plugin: "kotlin-android"
131127
}
132128

129+
if (applyJunit5Plugin) {
130+
project.apply plugin: "de.mannodermaus.android-junit5"
131+
}
132+
133133
// Default configuration
134134
project.android {
135135
compileSdkVersion environment.compileSdkVersion

0 commit comments

Comments
 (0)