Skip to content

Commit d62ca3a

Browse files
neighbWangneighbWang
committed
Support AGP 8.0 & 8.1 & 8.2
1 parent c1fcb57 commit d62ca3a

File tree

319 files changed

+2436
-16815
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+2436
-16815
lines changed

‎.github/workflows/dokka.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/setup-java@v3
2020
with:
2121
distribution: 'adopt'
22-
java-version: '11'
22+
java-version: '17'
2323
cache: 'gradle'
2424
- shell: bash
2525
run: ./gradlew reference -S --no-daemon

‎.github/workflows/publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ jobs:
1616
- uses: actions/setup-java@v3
1717
with:
1818
distribution: 'adopt'
19-
java-version: '11'
19+
java-version: '17'
2020
cache: 'gradle'
2121
- shell: bash
2222
run: |
2323
echo "Create GPG private key"
2424
echo $GPG_KEY_ARMOR | base64 --decode > $GITHUB_WORKSPACE/secring.gpg
2525
./gradlew publishToSonatype closeAndReleaseStagingRepository -Pversion=${GITHUB_REF/refs\/tags\/v/} -POSSRH_USERNAME=${OSSRH_USERNAME} -POSSRH_PASSWORD=${OSSRH_PASSWORD} -POSSRH_STAGING_PROFILE_ID=${OSSRH_STAGING_PROFILE_ID} -Psigning.keyId=${GPG_KEY_ID} -Psigning.password=${GPG_PASSPHRASE} -Psigning.secretKeyRingFile=${GITHUB_WORKSPACE}/secring.gpg -S --no-daemon
2626
env:
27-
JAVA_OPTS: -Xmx8g -XX:MaxPermSize=1g -XX:MetaspaceSize=1g -Dfile.encoding=UTF-8
28-
JVM_OPTS: -Xmx8g -XX:MaxPermSize=1g -XX:MetaspaceSize=1g -Dfile.encoding=UTF-8
27+
JAVA_OPTS: -Xmx8g -XX:MetaspaceSize=1g -Dfile.encoding=UTF-8
28+
JVM_OPTS: -Xmx8g -XX:MetaspaceSize=1g -Dfile.encoding=UTF-8
2929
GPG_KEY_ARMOR: ${{ secrets.GPG_KEY_ARMOR }}
3030
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
3131
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

‎.github/workflows/test.yml‎

Lines changed: 20 additions & 227 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/setup-java@v3
3030
with:
3131
distribution: 'adopt'
32-
java-version: '11'
32+
java-version: '17'
3333
cache: 'gradle'
3434
- uses: actions/cache@v3
3535
with:
@@ -55,7 +55,7 @@ jobs:
5555
- uses: actions/setup-java@v3
5656
with:
5757
distribution: 'adopt'
58-
java-version: '11'
58+
java-version: '17'
5959
cache: 'gradle'
6060
- uses: actions/cache@v3
6161
with:
@@ -73,278 +73,71 @@ jobs:
7373
name: unit-test-report
7474
path: '**/build/reports/tests/test'
7575

76-
integration-test-agp-v3_3:
77-
name: AGP 3.3 Integration Test
76+
integration-test-agp-v8_0:
77+
name: AGP 8.0 Integration Test
7878
needs: build
7979
runs-on: ubuntu-latest
8080
steps:
8181
- uses: actions/checkout@v3
8282
- uses: actions/setup-java@v3
8383
with:
8484
distribution: 'adopt'
85-
java-version: '11'
85+
java-version: '17'
8686
cache: 'gradle'
8787
- uses: actions/cache@v3
8888
with:
8989
path: ~/.m2
9090
key: ${{ runner.os }}-m2-${{ github.run_number }}
9191
- shell: bash
92-
run: ./gradlew booster-android-gradle-v3_3:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
92+
run: ./gradlew booster-android-gradle-v8_0:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
9393
- uses: actions/upload-artifact@v3
9494
if: failure()
9595
with:
96-
name: booster-android-gradle-v3_3
97-
path: booster-android-gradle-v3_3/build/reports/tests/integrationTest
96+
name: booster-android-gradle-v8_0
97+
path: booster-android-gradle-v8_0/build/reports/tests/integrationTest
9898

99-
integration-test-agp-v3_4:
100-
name: AGP 3.4 Integration Test
99+
integration-test-agp-v8_1:
100+
name: AGP 8.1 Integration Test
101101
needs: build
102102
runs-on: ubuntu-latest
103103
steps:
104104
- uses: actions/checkout@v3
105105
- uses: actions/setup-java@v3
106106
with:
107107
distribution: 'adopt'
108-
java-version: '11'
108+
java-version: '17'
109109
cache: 'gradle'
110110
- uses: actions/cache@v3
111111
with:
112112
path: ~/.m2
113113
key: ${{ runner.os }}-m2-${{ github.run_number }}
114114
- shell: bash
115-
run: ./gradlew booster-android-gradle-v3_4:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
115+
run: ./gradlew booster-android-gradle-v8_1:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
116116
- uses: actions/upload-artifact@v3
117117
if: failure()
118118
with:
119-
name: booster-android-gradle-v3_4
120-
path: booster-android-gradle-v3_4/build/reports/tests/integrationTest
119+
name: booster-android-gradle-v8_1
120+
path: booster-android-gradle-v8_1/build/reports/tests/integrationTest
121121

122-
integration-test-agp-v3_5:
123-
name: AGP 3.5 Integration Test
122+
integration-test-agp-v8_2:
123+
name: AGP 8.2 Integration Test
124124
needs: build
125125
runs-on: ubuntu-latest
126126
steps:
127127
- uses: actions/checkout@v3
128128
- uses: actions/setup-java@v3
129129
with:
130130
distribution: 'adopt'
131-
java-version: '11'
131+
java-version: '17'
132132
cache: 'gradle'
133133
- uses: actions/cache@v3
134134
with:
135135
path: ~/.m2
136136
key: ${{ runner.os }}-m2-${{ github.run_number }}
137137
- shell: bash
138-
run: ./gradlew booster-android-gradle-v3_5:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
138+
run: ./gradlew booster-android-gradle-v8_2:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
139139
- uses: actions/upload-artifact@v3
140140
if: failure()
141141
with:
142-
name: booster-android-gradle-v3_5
143-
path: booster-android-gradle-v3_5/build/reports/tests/integrationTest
144-
145-
integration-test-agp-v3_6:
146-
name: AGP 3.6 Integration Test
147-
needs: build
148-
runs-on: ubuntu-latest
149-
steps:
150-
- uses: actions/checkout@v3
151-
- uses: actions/setup-java@v3
152-
with:
153-
distribution: 'adopt'
154-
java-version: '11'
155-
cache: 'gradle'
156-
- uses: actions/cache@v3
157-
with:
158-
path: ~/.m2
159-
key: ${{ runner.os }}-m2-${{ github.run_number }}
160-
- shell: bash
161-
run: ./gradlew booster-android-gradle-v3_6:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
162-
- uses: actions/upload-artifact@v3
163-
if: failure()
164-
with:
165-
name: booster-android-gradle-v3_6
166-
path: booster-android-gradle-v3_6/build/reports/tests/integrationTest
167-
168-
integration-test-agp-v4_0:
169-
name: AGP 4.0 Integration Test
170-
needs: build
171-
runs-on: ubuntu-latest
172-
steps:
173-
- uses: actions/checkout@v3
174-
- uses: actions/setup-java@v3
175-
with:
176-
distribution: 'adopt'
177-
java-version: '11'
178-
cache: 'gradle'
179-
- uses: actions/cache@v3
180-
with:
181-
path: ~/.m2
182-
key: ${{ runner.os }}-m2-${{ github.run_number }}
183-
- shell: bash
184-
run: ./gradlew booster-android-gradle-v4_0:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
185-
- uses: actions/upload-artifact@v3
186-
if: failure()
187-
with:
188-
name: booster-android-gradle-v4_0
189-
path: booster-android-gradle-v4_0/build/reports/tests/integrationTest
190-
191-
integration-test-agp-v4_1:
192-
name: AGP 4.1 Integration Test
193-
needs: build
194-
runs-on: ubuntu-latest
195-
steps:
196-
- uses: actions/checkout@v3
197-
- uses: actions/setup-java@v3
198-
with:
199-
distribution: 'adopt'
200-
java-version: '11'
201-
cache: 'gradle'
202-
- uses: actions/cache@v3
203-
with:
204-
path: ~/.m2
205-
key: ${{ runner.os }}-m2-${{ github.run_number }}
206-
- shell: bash
207-
run: ./gradlew booster-android-gradle-v4_1:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
208-
- uses: actions/upload-artifact@v3
209-
if: failure()
210-
with:
211-
name: booster-android-gradle-v4_1
212-
path: booster-android-gradle-v4_1/build/reports/tests/integrationTest
213-
214-
integration-test-agp-v4_2:
215-
name: AGP 4.2 Integration Test
216-
needs: build
217-
runs-on: ubuntu-latest
218-
steps:
219-
- uses: actions/checkout@v3
220-
- uses: actions/setup-java@v3
221-
with:
222-
distribution: 'adopt'
223-
java-version: '11'
224-
cache: 'gradle'
225-
- uses: actions/cache@v3
226-
with:
227-
path: ~/.m2
228-
key: ${{ runner.os }}-m2-${{ github.run_number }}
229-
- shell: bash
230-
run: ./gradlew booster-android-gradle-v4_2:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
231-
- uses: actions/upload-artifact@v3
232-
if: failure()
233-
with:
234-
name: booster-android-gradle-v4_2
235-
path: booster-android-gradle-v4_2/build/reports/tests/integrationTest
236-
237-
integration-test-agp-v7_0:
238-
name: AGP 7.0 Integration Test
239-
needs: build
240-
runs-on: ubuntu-latest
241-
steps:
242-
- uses: actions/checkout@v3
243-
- uses: actions/setup-java@v3
244-
with:
245-
distribution: 'adopt'
246-
java-version: '11'
247-
cache: 'gradle'
248-
- uses: actions/cache@v3
249-
with:
250-
path: ~/.m2
251-
key: ${{ runner.os }}-m2-${{ github.run_number }}
252-
- shell: bash
253-
run: ./gradlew booster-android-gradle-v7_0:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
254-
- uses: actions/upload-artifact@v3
255-
if: failure()
256-
with:
257-
name: booster-android-gradle-v7_0
258-
path: booster-android-gradle-v7_0/build/reports/tests/integrationTest
259-
260-
integration-test-agp-v7_1:
261-
name: AGP 7.1 Integration Test
262-
needs: build
263-
runs-on: ubuntu-latest
264-
steps:
265-
- uses: actions/checkout@v3
266-
- uses: actions/setup-java@v3
267-
with:
268-
distribution: 'adopt'
269-
java-version: '11'
270-
cache: 'gradle'
271-
- uses: actions/cache@v3
272-
with:
273-
path: ~/.m2
274-
key: ${{ runner.os }}-m2-${{ github.run_number }}
275-
- shell: bash
276-
run: ./gradlew booster-android-gradle-v7_1:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
277-
- uses: actions/upload-artifact@v3
278-
if: failure()
279-
with:
280-
name: booster-android-gradle-v7_1
281-
path: booster-android-gradle-v7_1/build/reports/tests/integrationTest
282-
283-
integration-test-agp-v7_2:
284-
name: AGP 7.2 Integration Test
285-
needs: build
286-
runs-on: ubuntu-latest
287-
steps:
288-
- uses: actions/checkout@v3
289-
- uses: actions/setup-java@v3
290-
with:
291-
distribution: 'adopt'
292-
java-version: '11'
293-
cache: 'gradle'
294-
- uses: actions/cache@v3
295-
with:
296-
path: ~/.m2
297-
key: ${{ runner.os }}-m2-${{ github.run_number }}
298-
- shell: bash
299-
run: ./gradlew booster-android-gradle-v7_2:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
300-
- uses: actions/upload-artifact@v3
301-
if: failure()
302-
with:
303-
name: booster-android-gradle-v7_2
304-
path: booster-android-gradle-v7_2/build/reports/tests/integrationTest
305-
306-
integration-test-agp-v7_3:
307-
name: AGP 7.3 Integration Test
308-
needs: build
309-
runs-on: ubuntu-latest
310-
steps:
311-
- uses: actions/checkout@v3
312-
- uses: actions/setup-java@v3
313-
with:
314-
distribution: 'adopt'
315-
java-version: '11'
316-
cache: 'gradle'
317-
- uses: actions/cache@v3
318-
with:
319-
path: ~/.m2
320-
key: ${{ runner.os }}-m2-${{ github.run_number }}
321-
- shell: bash
322-
run: ./gradlew booster-android-gradle-v7_3:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
323-
- uses: actions/upload-artifact@v3
324-
if: failure()
325-
with:
326-
name: booster-android-gradle-v7_3
327-
path: booster-android-gradle-v7_3/build/reports/tests/integrationTest
328-
329-
integration-test-agp-v7_4:
330-
name: AGP 7.4 Integration Test
331-
needs: build
332-
runs-on: ubuntu-latest
333-
steps:
334-
- uses: actions/checkout@v3
335-
- uses: actions/setup-java@v3
336-
with:
337-
distribution: 'adopt'
338-
java-version: '11'
339-
cache: 'gradle'
340-
- uses: actions/cache@v3
341-
with:
342-
path: ~/.m2
343-
key: ${{ runner.os }}-m2-${{ github.run_number }}
344-
- shell: bash
345-
run: ./gradlew booster-android-gradle-v7_4:integrationTest -S --no-daemon -Pversion=${{ github.run_number }}
346-
- uses: actions/upload-artifact@v3
347-
if: failure()
348-
with:
349-
name: booster-android-gradle-v7_4
350-
path: booster-android-gradle-v7_4/build/reports/tests/integrationTest
142+
name: booster-android-gradle-v8_2
143+
path: booster-android-gradle-v8_2/build/reports/tests/integrationTest

‎booster-aapt2/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply from: "$rootDir/gradle/booster.gradle"
22

33
dependencies {
4-
api 'com.google.protobuf:protobuf-java:3.10.0'
5-
testImplementation 'com.android.tools.build:gradle:4.0.0'
4+
api 'com.google.protobuf:protobuf-java:3.19.3'
5+
testImplementation 'com.android.tools.build:gradle:8.0.0'
66
}

‎booster-android-api/src/main/java/android/os/Build.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ public static class VERSION {
151151
private static final String[] ALL_CODENAMES = getStringList("ro.build.version.all_codenames", ",");
152152

153153
/**
154-
* @hide
155154
*/
156155
public static final String[] ACTIVE_CODENAMES = "REL".equals(ALL_CODENAMES[0])
157156
? new String[0] : ALL_CODENAMES;
@@ -161,7 +160,6 @@ public static class VERSION {
161160
* Use the current SDK version code. For every active development codename
162161
* we are operating under, we bump the assumed resource platform version by 1.
163162
*
164-
* @hide
165163
*/
166164
public static final int RESOURCES_SDK_INT = SDK_INT + ACTIVE_CODENAMES.length;
167165

‎booster-android-api/src/main/java/android/util/Log.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
* into an application except during development. Debug logs are compiled
1313
* in but stripped at runtime. Error, warning and info logs are always kept.
1414
*
15-
* <p><b>Tip:</b> A good convention is to declare a <code>TAG</code> constant
15+
* <b>Tip:</b> A good convention is to declare a <code>TAG</code> constant
1616
* in your class:
1717
*
1818
* <pre>private static final String TAG = "MyActivity";</pre>
1919
*
2020
* and use that in subsequent calls to the log methods.
21-
* </p>
2221
*
23-
* <p><b>Tip:</b> Don't forget that when you make a call like
22+
* <b>Tip:</b> Don't forget that when you make a call like
2423
* <pre>Log.v(TAG, "index=" + i);</pre>
2524
* that when you're building the string to pass into Log.d, the compiler uses a
2625
* StringBuilder and at least three allocations occur: the StringBuilder

‎booster-android-api/src/main/java/android/view/ViewTreeObserver.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public interface OnScrollChangedListener {
127127
* This is only used for non-Activity windows. Activity windows can use
128128
* Activity.onEnterAnimationComplete() to get the same signal.
129129
*
130-
* @hide
131130
*/
132131
public interface OnWindowShownListener {
133132
/**

0 commit comments

Comments
 (0)