Skip to content

Commit 9ea5f9f

Browse files
authored
Merge pull request #280 from gradle/atual/agp-alpha08
Upgrade AGP support to 7.3.0-alpha08
2 parents b8001fb + 2e55b81 commit 9ea5f9f

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

.github/workflows/build-verification.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ jobs:
3838
- name: Run sanityCheck
3939
run: ./gradlew sanityCheck
4040

41+
tests:
42+
name: Tests
43+
runs-on: ubuntu-latest
44+
steps:
45+
- uses: actions/checkout@v2
46+
- uses: actions/setup-java@v2
47+
with:
48+
java-version: 11
49+
distribution: 'adopt'
50+
- name: Set up Gradle
51+
uses: gradle/gradle-build-action@v2
52+
- name: Run unit tests
53+
run: ./gradlew test
54+
4155
android_version_tests:
4256
name: Android version tests
4357
needs: [ generate_versions, sanity_check ]

src/main/resources/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"supportedVersions": {
3-
"7.3.0-alpha07": [
3+
"7.3.0-alpha08": [
44
"7.4.2"
55
],
66
"7.2.0-beta04": [

src/test/groovy/org/gradle/android/WorkaroundTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class WorkaroundTest extends Specification {
1212
workarounds.collect { it.class.simpleName.replaceAll(/Workaround/, "") }.sort() == expectedWorkarounds.sort()
1313
where:
1414
androidVersion | expectedWorkarounds
15-
"7.3.0-alpha07" | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
16-
"7.2.0-beta04" | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
17-
"7.1.3" | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
18-
"7.0.4" | ['ZipMergingTask', 'LibraryJniLibs', 'DataBindingMergeDependencyArtifacts', 'BundleLibraryClasses', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'MergeNativeLibs', 'CompileLibraryResources']
15+
"7.3.0-alpha08" | ['CompileLibraryResources', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
16+
"7.2.0-beta04" | ['CompileLibraryResources', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'ZipMergingTask']
17+
"7.1.3" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask']
18+
"7.0.4" | ['BundleLibraryClasses', 'CompileLibraryResources', 'DataBindingMergeDependencyArtifacts', 'LibraryJniLibs', 'MergeNativeLibs', 'MergeSourceSetFolders', 'RoomSchemaLocation', 'StripDebugSymbols', 'ZipMergingTask']
1919
}
2020
}

src/test/resources/expectedOutcomes/7.3.0-alpha07_outcomes.json renamed to src/test/resources/expectedOutcomes/7.3.0-alpha08_outcomes.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
":app:dataBindingGenBaseClassesRelease" : "FROM_CACHE",
2929
":app:dataBindingMergeDependencyArtifactsDebug" : "SUCCESS",
3030
":app:dataBindingMergeDependencyArtifactsRelease" : "SUCCESS",
31-
":app:dataBindingMergeGenClassesDebug" : "FROM_CACHE",
32-
":app:dataBindingMergeGenClassesRelease" : "FROM_CACHE",
3331
":app:dataBindingTriggerDebug" : "SUCCESS",
3432
":app:dataBindingTriggerRelease" : "SUCCESS",
3533
":app:desugarDebugFileDependencies" : "FROM_CACHE",
@@ -135,8 +133,6 @@
135133
":library:dataBindingGenBaseClassesRelease" : "FROM_CACHE",
136134
":library:dataBindingMergeDependencyArtifactsDebug" : "SUCCESS",
137135
":library:dataBindingMergeDependencyArtifactsRelease": "SUCCESS",
138-
":library:dataBindingMergeGenClassesDebug" : "FROM_CACHE",
139-
":library:dataBindingMergeGenClassesRelease" : "FROM_CACHE",
140136
":library:dataBindingTriggerDebug" : "SUCCESS",
141137
":library:dataBindingTriggerRelease" : "SUCCESS",
142138
":library:extractDebugAnnotations" : "FROM_CACHE",

0 commit comments

Comments
 (0)