Skip to content
This repository was archived by the owner on May 31, 2023. It is now read-only.

Commit 976f6b6

Browse files
lptrlptr
committed
Support Android 3.2.x
It actually fails with anything newer than 3.2.0-alpha01
1 parent 6a21899 commit 976f6b6

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

‎src/test/groovy/org/gradle/android/test/RelocationTest.groovy‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableMap
44
import org.gradle.testkit.runner.BuildResult
55
import org.gradle.testkit.runner.GradleRunner
66
import org.gradle.testkit.runner.TaskOutcome
7+
import org.gradle.util.VersionNumber
78
import org.junit.Rule
89
import org.junit.rules.TemporaryFolder
910
import spock.lang.Specification
@@ -20,7 +21,7 @@ class RelocationTest extends Specification {
2021
static final String SCAN_URL_PROPERTY = "org.gradle.android.test.scan-url"
2122

2223
static final String DEFAULT_GRADLE_VERSION = "4.6"
23-
static final String DEFAULT_ANDROID_VERSION = "3.1.0-rc01"
24+
static final String DEFAULT_ANDROID_VERSION = "3.2.0-alpha05"
2425

2526
@Rule TemporaryFolder temporaryFolder
2627
File cacheDir
@@ -61,6 +62,7 @@ class RelocationTest extends Specification {
6162
rootProject { root ->
6263
buildscript {
6364
repositories {
65+
mavenLocal()
6466
maven {
6567
url "https://plugins.gradle.org/m2/"
6668
}
@@ -86,6 +88,7 @@ class RelocationTest extends Specification {
8688
"--build-cache",
8789
"--scan",
8890
"--init-script", initScript.absolutePath,
91+
"-Dorg.gradle.caching.debug=true"
8992
]
9093

9194
cleanCheckout(originalDir, defaultArgs)
@@ -154,10 +157,11 @@ class RelocationTest extends Specification {
154157

155158
def expectedResults() {
156159
def builder = ImmutableMap.<String, TaskOutcome>builder()
160+
def android32x = VersionNumber.parse(androidPluginVersion) >= VersionNumber.parse("3.2.0-alpha01")
157161
builder.put(':common:assembleDebug', SUCCESS)
158162
builder.put(':common:bundleDebug', SUCCESS)
159163
builder.put(':common:checkDebugManifest', SUCCESS)
160-
builder.put(':common:compileDebugAidl', FROM_CACHE)
164+
builder.put(':common:compileDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
161165
builder.put(':common:compileDebugJavaWithJavac', FROM_CACHE)
162166
builder.put(':common:compileDebugNdk', NO_SOURCE)
163167
builder.put(':common:compileDebugRenderscript', FROM_CACHE)
@@ -192,7 +196,7 @@ class RelocationTest extends Specification {
192196
builder.put(':dasherdancer:assembleDebug', SUCCESS)
193197
builder.put(':dasherdancer:bundleDebug', SUCCESS)
194198
builder.put(':dasherdancer:checkDebugManifest', SUCCESS)
195-
builder.put(':dasherdancer:compileDebugAidl', FROM_CACHE)
199+
builder.put(':dasherdancer:compileDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
196200
builder.put(':dasherdancer:compileDebugJavaWithJavac', FROM_CACHE)
197201
builder.put(':dasherdancer:compileDebugNdk', NO_SOURCE)
198202
builder.put(':dasherdancer:compileDebugRenderscript', FROM_CACHE)
@@ -227,7 +231,7 @@ class RelocationTest extends Specification {
227231
builder.put(':doodles:assembleDebug', SUCCESS)
228232
builder.put(':doodles:bundleDebug', SUCCESS)
229233
builder.put(':doodles:checkDebugManifest', SUCCESS)
230-
builder.put(':doodles:compileDebugAidl', FROM_CACHE)
234+
builder.put(':doodles:compileDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
231235
builder.put(':doodles:compileDebugJavaWithJavac', FROM_CACHE)
232236
builder.put(':doodles:compileDebugNdk', NO_SOURCE)
233237
builder.put(':doodles:compileDebugRenderscript', FROM_CACHE)
@@ -262,7 +266,7 @@ class RelocationTest extends Specification {
262266
builder.put(':presentquest:assembleDebug', SUCCESS)
263267
builder.put(':presentquest:bundleDebug', SUCCESS)
264268
builder.put(':presentquest:checkDebugManifest', SUCCESS)
265-
builder.put(':presentquest:compileDebugAidl', FROM_CACHE)
269+
builder.put(':presentquest:compileDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
266270
builder.put(':presentquest:compileDebugJavaWithJavac', FROM_CACHE)
267271
builder.put(':presentquest:compileDebugNdk', NO_SOURCE)
268272
builder.put(':presentquest:compileDebugRenderscript', FROM_CACHE)
@@ -297,7 +301,7 @@ class RelocationTest extends Specification {
297301
builder.put(':rocketsleigh:assembleDebug', SUCCESS)
298302
builder.put(':rocketsleigh:bundleDebug', SUCCESS)
299303
builder.put(':rocketsleigh:checkDebugManifest', SUCCESS)
300-
builder.put(':rocketsleigh:compileDebugAidl', FROM_CACHE)
304+
builder.put(':rocketsleigh:compileDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
301305
builder.put(':rocketsleigh:compileDebugJavaWithJavac', FROM_CACHE)
302306
builder.put(':rocketsleigh:compileDebugNdk', NO_SOURCE)
303307
builder.put(':rocketsleigh:compileDebugRenderscript', FROM_CACHE)
@@ -334,13 +338,13 @@ class RelocationTest extends Specification {
334338
builder.put(':santa-tracker:assembleProductionDebug', SUCCESS)
335339
builder.put(':santa-tracker:checkDevelopmentDebugManifest', SUCCESS)
336340
builder.put(':santa-tracker:checkProductionDebugManifest', SUCCESS)
337-
builder.put(':santa-tracker:compileDevelopmentDebugAidl', FROM_CACHE)
341+
builder.put(':santa-tracker:compileDevelopmentDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
338342
builder.put(':santa-tracker:compileDevelopmentDebugJavaWithJavac', FROM_CACHE)
339343
builder.put(':santa-tracker:compileDevelopmentDebugNdk', NO_SOURCE)
340344
builder.put(':santa-tracker:compileDevelopmentDebugRenderscript', FROM_CACHE)
341345
builder.put(':santa-tracker:compileDevelopmentDebugShaders', FROM_CACHE)
342346
builder.put(':santa-tracker:compileDevelopmentDebugSources', UP_TO_DATE)
343-
builder.put(':santa-tracker:compileProductionDebugAidl', FROM_CACHE)
347+
builder.put(':santa-tracker:compileProductionDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
344348
builder.put(':santa-tracker:compileProductionDebugJavaWithJavac', FROM_CACHE)
345349
builder.put(':santa-tracker:compileProductionDebugNdk', NO_SOURCE)
346350
builder.put(':santa-tracker:compileProductionDebugRenderscript', FROM_CACHE)
@@ -401,7 +405,7 @@ class RelocationTest extends Specification {
401405
builder.put(':snowdown:assembleDebug', SUCCESS)
402406
builder.put(':snowdown:bundleDebug', SUCCESS)
403407
builder.put(':snowdown:checkDebugManifest', SUCCESS)
404-
builder.put(':snowdown:compileDebugAidl', FROM_CACHE)
408+
builder.put(':snowdown:compileDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
405409
builder.put(':snowdown:compileDebugJavaWithJavac', FROM_CACHE)
406410
builder.put(':snowdown:compileDebugNdk', NO_SOURCE)
407411
builder.put(':snowdown:compileDebugRenderscript', FROM_CACHE)
@@ -436,7 +440,7 @@ class RelocationTest extends Specification {
436440
builder.put(':village:assembleDebug', SUCCESS)
437441
builder.put(':village:bundleDebug', SUCCESS)
438442
builder.put(':village:checkDebugManifest', SUCCESS)
439-
builder.put(':village:compileDebugAidl', FROM_CACHE)
443+
builder.put(':village:compileDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
440444
builder.put(':village:compileDebugJavaWithJavac', FROM_CACHE)
441445
builder.put(':village:compileDebugNdk', NO_SOURCE)
442446
builder.put(':village:compileDebugRenderscript', FROM_CACHE)
@@ -470,7 +474,7 @@ class RelocationTest extends Specification {
470474
builder.put(':village:transformResourcesWithMergeJavaResForDebug', SUCCESS)
471475
builder.put(':wearable:assembleDebug', SUCCESS)
472476
builder.put(':wearable:checkDebugManifest', SUCCESS)
473-
builder.put(':wearable:compileDebugAidl', FROM_CACHE)
477+
builder.put(':wearable:compileDebugAidl', android32x ? NO_SOURCE : FROM_CACHE)
474478
builder.put(':wearable:compileDebugJavaWithJavac', FROM_CACHE)
475479
builder.put(':wearable:compileDebugNdk', NO_SOURCE)
476480
builder.put(':wearable:compileDebugRenderscript', FROM_CACHE)

0 commit comments

Comments
 (0)