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

Commit 6a21899

Browse files
lptrlptr
committed
Support Android 3.1.x
1 parent 2b0bdab commit 6a21899

File tree

3 files changed

+47
-73
lines changed

3 files changed

+47
-73
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ cache:
1414

1515
android:
1616
components:
17-
- build-tools-26.0.2
18-
- build-tools-27.0.1
17+
- build-tools-27.0.3
1918
- android-26
2019

2120
notifications:

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ test {
5454
systemProperty "relocated.dir", relocatedDir.absolutePath
5555
systemProperty "org.gradle.android.test.gradle-installation", System.getProperty("org.gradle.android.test.gradle-installation")
5656
systemProperty "org.gradle.android.test.android-version", System.getProperty("org.gradle.android.test.android-version")
57-
systemProperty "org.gradle.android.test.android-cache-fix-version", System.getProperty("org.gradle.android.test.android-cache-fix-version")
5857
systemProperty "org.gradle.android.test.scan-url", System.getProperty("org.gradle.android.test.scan-url")
5958

6059
inputs.dir originalDir withPropertyName "original.dir"

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

Lines changed: 46 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import org.gradle.testkit.runner.TaskOutcome
77
import org.junit.Rule
88
import org.junit.rules.TemporaryFolder
99
import spock.lang.Specification
10-
import spock.lang.Unroll
1110

1211
import static org.gradle.testkit.runner.TaskOutcome.FROM_CACHE
1312
import static org.gradle.testkit.runner.TaskOutcome.NO_SOURCE
@@ -18,17 +17,14 @@ class RelocationTest extends Specification {
1817

1918
static final String GRADLE_INSTALLATION_PROPERTY = "org.gradle.android.test.gradle-installation"
2019
static final String ANDROID_VERSION_PROPERTY = "org.gradle.android.test.android-version"
21-
static final String ANDROID_CACHE_FIX_VERSION_PROPERTY = "org.gradle.android.test.android-cache-fix-version"
2220
static final String SCAN_URL_PROPERTY = "org.gradle.android.test.scan-url"
2321

24-
static final String DEFAULT_GRADLE_VERSION = "4.4-rc-3"
25-
static final String DEFAULT_ANDROID_VERSION = "3.1.0-alpha04"
26-
static final String DEFAULT_ANDROID_CACHE_FIX_VERSION = "0.2.0"
22+
static final String DEFAULT_GRADLE_VERSION = "4.6"
23+
static final String DEFAULT_ANDROID_VERSION = "3.1.0-rc01"
2724

2825
@Rule TemporaryFolder temporaryFolder
2926
File cacheDir
3027
String androidPluginVersion
31-
String androidCacheFixVersion
3228
String scanUrl
3329

3430
def setup() {
@@ -39,16 +35,10 @@ class RelocationTest extends Specification {
3935
androidPluginVersion = DEFAULT_ANDROID_VERSION
4036
}
4137

42-
androidCacheFixVersion = System.getProperty(ANDROID_CACHE_FIX_VERSION_PROPERTY)
43-
if (!androidCacheFixVersion) {
44-
androidCacheFixVersion = DEFAULT_ANDROID_CACHE_FIX_VERSION
45-
}
46-
4738
scanUrl = System.getProperty(SCAN_URL_PROPERTY)
4839
}
4940

50-
@Unroll
51-
def "santa-tracker can be built relocatably #cacheFixApplied"() {
41+
def "santa-tracker can be built relocatably"() {
5242
def tasksToRun = ["assembleDebug"]
5343

5444
println "> Using Android plugin ${androidPluginVersion}"
@@ -57,23 +47,7 @@ class RelocationTest extends Specification {
5747
def originalDir = new File(System.getProperty("original.dir"))
5848
def relocatedDir = new File(System.getProperty("relocated.dir"))
5949

60-
def expectedResults = expectedResults(applyCacheFix)
61-
62-
def applyCacheFixPluginIfNecessary = applyCacheFix ? """
63-
rootProject {
64-
buildscript {
65-
dependencies {
66-
classpath 'gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin:$androidCacheFixVersion'
67-
}
68-
}
69-
}
70-
71-
allprojects { project ->
72-
project.plugins.matching({ it.class.name == "com.android.build.gradle.api.AndroidBasePlugin" }).all {
73-
project.apply plugin: 'org.gradle.android.cache-fix'
74-
}
75-
}
76-
""" : ""
50+
def expectedResults = expectedResults()
7751

7852
def scanPluginConfiguration = scanUrl ? """
7953
plugins.matching({ it.class.name == "com.gradle.scan.plugin.BuildScanPlugin" }).all {
@@ -99,8 +73,6 @@ class RelocationTest extends Specification {
9973
$scanPluginConfiguration
10074
}
10175
102-
$applyCacheFixPluginIfNecessary
103-
10476
settingsEvaluated { settings ->
10577
settings.buildCache {
10678
local(DirectoryBuildCache) {
@@ -114,7 +86,6 @@ class RelocationTest extends Specification {
11486
"--build-cache",
11587
"--scan",
11688
"--init-script", initScript.absolutePath,
117-
"-Dorg.gradle.android.cache-fix.ignoreVersionCheck=true",
11889
]
11990

12091
cleanCheckout(originalDir, defaultArgs)
@@ -135,10 +106,6 @@ class RelocationTest extends Specification {
135106
.build()
136107
then:
137108
expectedResults.verify(relocatedResult)
138-
139-
where:
140-
applyCacheFix << [false, true]
141-
cacheFixApplied = applyCacheFix ? "with cache fix" : "without cache fix"
142109
}
143110

144111
private void cleanCheckout(File dir, List<String> defaultArgs) {
@@ -163,8 +130,14 @@ class RelocationTest extends Specification {
163130
def outcomesWithMatchingTasks = outcomes.findAll { result.task(it.key) }
164131
def hasMatchingTasks = outcomesWithMatchingTasks.size() == outcomes.size() && outcomesWithMatchingTasks.size() == result.tasks.size()
165132
if (!hasMatchingTasks) {
166-
println "> Tasks missing: " + (outcomes.findAll { !outcomesWithMatchingTasks.keySet().contains(it.key) })
167-
println "> Tasks in surplus: " + (result.tasks.findAll { !outcomesWithMatchingTasks.keySet().contains(it.path) })
133+
println "> Tasks missing: "
134+
outcomes.findAll { !outcomesWithMatchingTasks.keySet().contains(it.key) }.each {
135+
println "> - $it"
136+
}
137+
println "> Tasks in surplus: "
138+
result.tasks.findAll { !outcomesWithMatchingTasks.keySet().contains(it.path) }.each {
139+
println "> - $it"
140+
}
168141
}
169142

170143
boolean allOutcomesMatched = true
@@ -179,17 +152,17 @@ class RelocationTest extends Specification {
179152
}
180153
}
181154

182-
def expectedResults(boolean fixApplied) {
155+
def expectedResults() {
183156
def builder = ImmutableMap.<String, TaskOutcome>builder()
184157
builder.put(':common:assembleDebug', SUCCESS)
185158
builder.put(':common:bundleDebug', SUCCESS)
186-
builder.put(':common:checkDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
159+
builder.put(':common:checkDebugManifest', SUCCESS)
187160
builder.put(':common:compileDebugAidl', FROM_CACHE)
188-
builder.put(':common:compileDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
161+
builder.put(':common:compileDebugJavaWithJavac', FROM_CACHE)
189162
builder.put(':common:compileDebugNdk', NO_SOURCE)
190163
builder.put(':common:compileDebugRenderscript', FROM_CACHE)
191164
builder.put(':common:compileDebugShaders', FROM_CACHE)
192-
builder.put(':common:compileDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
165+
builder.put(':common:compileDebugSources', UP_TO_DATE)
193166
builder.put(':common:extractDebugAnnotations', FROM_CACHE)
194167
builder.put(':common:generateDebugAssets', UP_TO_DATE)
195168
builder.put(':common:generateDebugBuildConfig', FROM_CACHE)
@@ -218,13 +191,13 @@ class RelocationTest extends Specification {
218191
builder.put(':common:transformResourcesWithMergeJavaResForDebug', SUCCESS)
219192
builder.put(':dasherdancer:assembleDebug', SUCCESS)
220193
builder.put(':dasherdancer:bundleDebug', SUCCESS)
221-
builder.put(':dasherdancer:checkDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
194+
builder.put(':dasherdancer:checkDebugManifest', SUCCESS)
222195
builder.put(':dasherdancer:compileDebugAidl', FROM_CACHE)
223-
builder.put(':dasherdancer:compileDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
196+
builder.put(':dasherdancer:compileDebugJavaWithJavac', FROM_CACHE)
224197
builder.put(':dasherdancer:compileDebugNdk', NO_SOURCE)
225198
builder.put(':dasherdancer:compileDebugRenderscript', FROM_CACHE)
226199
builder.put(':dasherdancer:compileDebugShaders', FROM_CACHE)
227-
builder.put(':dasherdancer:compileDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
200+
builder.put(':dasherdancer:compileDebugSources', UP_TO_DATE)
228201
builder.put(':dasherdancer:extractDebugAnnotations', FROM_CACHE)
229202
builder.put(':dasherdancer:generateDebugAssets', UP_TO_DATE)
230203
builder.put(':dasherdancer:generateDebugBuildConfig', FROM_CACHE)
@@ -253,13 +226,13 @@ class RelocationTest extends Specification {
253226
builder.put(':dasherdancer:transformResourcesWithMergeJavaResForDebug', SUCCESS)
254227
builder.put(':doodles:assembleDebug', SUCCESS)
255228
builder.put(':doodles:bundleDebug', SUCCESS)
256-
builder.put(':doodles:checkDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
229+
builder.put(':doodles:checkDebugManifest', SUCCESS)
257230
builder.put(':doodles:compileDebugAidl', FROM_CACHE)
258-
builder.put(':doodles:compileDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
231+
builder.put(':doodles:compileDebugJavaWithJavac', FROM_CACHE)
259232
builder.put(':doodles:compileDebugNdk', NO_SOURCE)
260233
builder.put(':doodles:compileDebugRenderscript', FROM_CACHE)
261234
builder.put(':doodles:compileDebugShaders', FROM_CACHE)
262-
builder.put(':doodles:compileDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
235+
builder.put(':doodles:compileDebugSources', UP_TO_DATE)
263236
builder.put(':doodles:extractDebugAnnotations', FROM_CACHE)
264237
builder.put(':doodles:generateDebugAssets', UP_TO_DATE)
265238
builder.put(':doodles:generateDebugBuildConfig', FROM_CACHE)
@@ -288,13 +261,13 @@ class RelocationTest extends Specification {
288261
builder.put(':doodles:transformResourcesWithMergeJavaResForDebug', SUCCESS)
289262
builder.put(':presentquest:assembleDebug', SUCCESS)
290263
builder.put(':presentquest:bundleDebug', SUCCESS)
291-
builder.put(':presentquest:checkDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
264+
builder.put(':presentquest:checkDebugManifest', SUCCESS)
292265
builder.put(':presentquest:compileDebugAidl', FROM_CACHE)
293-
builder.put(':presentquest:compileDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
266+
builder.put(':presentquest:compileDebugJavaWithJavac', FROM_CACHE)
294267
builder.put(':presentquest:compileDebugNdk', NO_SOURCE)
295268
builder.put(':presentquest:compileDebugRenderscript', FROM_CACHE)
296269
builder.put(':presentquest:compileDebugShaders', FROM_CACHE)
297-
builder.put(':presentquest:compileDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
270+
builder.put(':presentquest:compileDebugSources', UP_TO_DATE)
298271
builder.put(':presentquest:extractDebugAnnotations', FROM_CACHE)
299272
builder.put(':presentquest:generateDebugAssets', UP_TO_DATE)
300273
builder.put(':presentquest:generateDebugBuildConfig', FROM_CACHE)
@@ -323,13 +296,13 @@ class RelocationTest extends Specification {
323296
builder.put(':presentquest:transformResourcesWithMergeJavaResForDebug', SUCCESS)
324297
builder.put(':rocketsleigh:assembleDebug', SUCCESS)
325298
builder.put(':rocketsleigh:bundleDebug', SUCCESS)
326-
builder.put(':rocketsleigh:checkDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
299+
builder.put(':rocketsleigh:checkDebugManifest', SUCCESS)
327300
builder.put(':rocketsleigh:compileDebugAidl', FROM_CACHE)
328-
builder.put(':rocketsleigh:compileDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
301+
builder.put(':rocketsleigh:compileDebugJavaWithJavac', FROM_CACHE)
329302
builder.put(':rocketsleigh:compileDebugNdk', NO_SOURCE)
330303
builder.put(':rocketsleigh:compileDebugRenderscript', FROM_CACHE)
331304
builder.put(':rocketsleigh:compileDebugShaders', FROM_CACHE)
332-
builder.put(':rocketsleigh:compileDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
305+
builder.put(':rocketsleigh:compileDebugSources', UP_TO_DATE)
333306
builder.put(':rocketsleigh:extractDebugAnnotations', FROM_CACHE)
334307
builder.put(':rocketsleigh:generateDebugAssets', UP_TO_DATE)
335308
builder.put(':rocketsleigh:generateDebugBuildConfig', FROM_CACHE)
@@ -359,20 +332,20 @@ class RelocationTest extends Specification {
359332
builder.put(':santa-tracker:assembleDebug', SUCCESS)
360333
builder.put(':santa-tracker:assembleDevelopmentDebug', SUCCESS)
361334
builder.put(':santa-tracker:assembleProductionDebug', SUCCESS)
362-
builder.put(':santa-tracker:checkDevelopmentDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
363-
builder.put(':santa-tracker:checkProductionDebugManifest', FROM_CACHE)
335+
builder.put(':santa-tracker:checkDevelopmentDebugManifest', SUCCESS)
336+
builder.put(':santa-tracker:checkProductionDebugManifest', SUCCESS)
364337
builder.put(':santa-tracker:compileDevelopmentDebugAidl', FROM_CACHE)
365-
builder.put(':santa-tracker:compileDevelopmentDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
338+
builder.put(':santa-tracker:compileDevelopmentDebugJavaWithJavac', FROM_CACHE)
366339
builder.put(':santa-tracker:compileDevelopmentDebugNdk', NO_SOURCE)
367340
builder.put(':santa-tracker:compileDevelopmentDebugRenderscript', FROM_CACHE)
368341
builder.put(':santa-tracker:compileDevelopmentDebugShaders', FROM_CACHE)
369-
builder.put(':santa-tracker:compileDevelopmentDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
342+
builder.put(':santa-tracker:compileDevelopmentDebugSources', UP_TO_DATE)
370343
builder.put(':santa-tracker:compileProductionDebugAidl', FROM_CACHE)
371-
builder.put(':santa-tracker:compileProductionDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
344+
builder.put(':santa-tracker:compileProductionDebugJavaWithJavac', FROM_CACHE)
372345
builder.put(':santa-tracker:compileProductionDebugNdk', NO_SOURCE)
373346
builder.put(':santa-tracker:compileProductionDebugRenderscript', FROM_CACHE)
374347
builder.put(':santa-tracker:compileProductionDebugShaders', FROM_CACHE)
375-
builder.put(':santa-tracker:compileProductionDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
348+
builder.put(':santa-tracker:compileProductionDebugSources', UP_TO_DATE)
376349
builder.put(':santa-tracker:createDevelopmentDebugCompatibleScreenManifests', FROM_CACHE)
377350
builder.put(':santa-tracker:createProductionDebugCompatibleScreenManifests', FROM_CACHE)
378351
builder.put(':santa-tracker:generateDevelopmentDebugAssets', UP_TO_DATE)
@@ -387,6 +360,8 @@ class RelocationTest extends Specification {
387360
builder.put(':santa-tracker:generateProductionDebugSources', SUCCESS)
388361
builder.put(':santa-tracker:javaPreCompileDevelopmentDebug', FROM_CACHE)
389362
builder.put(':santa-tracker:javaPreCompileProductionDebug', FROM_CACHE)
363+
builder.put(':santa-tracker:mainApkListPersistenceDevelopmentDebug', SUCCESS)
364+
builder.put(':santa-tracker:mainApkListPersistenceProductionDebug', SUCCESS)
390365
builder.put(':santa-tracker:mergeDevelopmentDebugAssets', FROM_CACHE)
391366
builder.put(':santa-tracker:mergeDevelopmentDebugJniLibFolders', FROM_CACHE)
392367
builder.put(':santa-tracker:mergeDevelopmentDebugResources', FROM_CACHE)
@@ -425,13 +400,13 @@ class RelocationTest extends Specification {
425400
builder.put(':santa-tracker:validateSigningProductionDebug', SUCCESS)
426401
builder.put(':snowdown:assembleDebug', SUCCESS)
427402
builder.put(':snowdown:bundleDebug', SUCCESS)
428-
builder.put(':snowdown:checkDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
403+
builder.put(':snowdown:checkDebugManifest', SUCCESS)
429404
builder.put(':snowdown:compileDebugAidl', FROM_CACHE)
430-
builder.put(':snowdown:compileDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
405+
builder.put(':snowdown:compileDebugJavaWithJavac', FROM_CACHE)
431406
builder.put(':snowdown:compileDebugNdk', NO_SOURCE)
432407
builder.put(':snowdown:compileDebugRenderscript', FROM_CACHE)
433408
builder.put(':snowdown:compileDebugShaders', FROM_CACHE)
434-
builder.put(':snowdown:compileDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
409+
builder.put(':snowdown:compileDebugSources', UP_TO_DATE)
435410
builder.put(':snowdown:extractDebugAnnotations', FROM_CACHE)
436411
builder.put(':snowdown:generateDebugAssets', UP_TO_DATE)
437412
builder.put(':snowdown:generateDebugBuildConfig', FROM_CACHE)
@@ -460,13 +435,13 @@ class RelocationTest extends Specification {
460435
builder.put(':snowdown:transformResourcesWithMergeJavaResForDebug', SUCCESS)
461436
builder.put(':village:assembleDebug', SUCCESS)
462437
builder.put(':village:bundleDebug', SUCCESS)
463-
builder.put(':village:checkDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
438+
builder.put(':village:checkDebugManifest', SUCCESS)
464439
builder.put(':village:compileDebugAidl', FROM_CACHE)
465-
builder.put(':village:compileDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
440+
builder.put(':village:compileDebugJavaWithJavac', FROM_CACHE)
466441
builder.put(':village:compileDebugNdk', NO_SOURCE)
467442
builder.put(':village:compileDebugRenderscript', FROM_CACHE)
468443
builder.put(':village:compileDebugShaders', FROM_CACHE)
469-
builder.put(':village:compileDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
444+
builder.put(':village:compileDebugSources', UP_TO_DATE)
470445
builder.put(':village:extractDebugAnnotations', FROM_CACHE)
471446
builder.put(':village:generateDebugAssets', UP_TO_DATE)
472447
builder.put(':village:generateDebugBuildConfig', FROM_CACHE)
@@ -494,20 +469,21 @@ class RelocationTest extends Specification {
494469
builder.put(':village:transformNativeLibsWithSyncJniLibsForDebug', SUCCESS)
495470
builder.put(':village:transformResourcesWithMergeJavaResForDebug', SUCCESS)
496471
builder.put(':wearable:assembleDebug', SUCCESS)
497-
builder.put(':wearable:checkDebugManifest', fixApplied ? FROM_CACHE : SUCCESS)
472+
builder.put(':wearable:checkDebugManifest', SUCCESS)
498473
builder.put(':wearable:compileDebugAidl', FROM_CACHE)
499-
builder.put(':wearable:compileDebugJavaWithJavac', fixApplied ? FROM_CACHE : SUCCESS)
474+
builder.put(':wearable:compileDebugJavaWithJavac', FROM_CACHE)
500475
builder.put(':wearable:compileDebugNdk', NO_SOURCE)
501476
builder.put(':wearable:compileDebugRenderscript', FROM_CACHE)
502477
builder.put(':wearable:compileDebugShaders', FROM_CACHE)
503-
builder.put(':wearable:compileDebugSources', fixApplied ? UP_TO_DATE : SUCCESS)
478+
builder.put(':wearable:compileDebugSources', UP_TO_DATE)
504479
builder.put(':wearable:createDebugCompatibleScreenManifests', FROM_CACHE)
505480
builder.put(':wearable:generateDebugAssets', UP_TO_DATE)
506481
builder.put(':wearable:generateDebugBuildConfig', FROM_CACHE)
507482
builder.put(':wearable:generateDebugResources', UP_TO_DATE)
508483
builder.put(':wearable:generateDebugResValues', FROM_CACHE)
509484
builder.put(':wearable:generateDebugSources', SUCCESS)
510485
builder.put(':wearable:javaPreCompileDebug', FROM_CACHE)
486+
builder.put(':wearable:mainApkListPersistenceDebug', SUCCESS)
511487
builder.put(':wearable:mergeDebugAssets', FROM_CACHE)
512488
builder.put(':wearable:mergeDebugJniLibFolders', FROM_CACHE)
513489
builder.put(':wearable:mergeDebugResources', FROM_CACHE)

0 commit comments

Comments
 (0)