jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade GitHub workflow java version (#4750)

Browse Source 
Summary:
[android] Upgrade GitHub workflow java version
Version 8 of AGP requires Java 17+. Let's upgrade it here.

There are some flags that are no longer supported, hence the update to gradle.properties.

Pull Request resolved: https://github.com/facebook/flipper/pull/4750

Test Plan:
- CI

 ---
Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/facebook/flipper/pull/4750).
* https://github.com/facebook/flipper/issues/4755
* https://github.com/facebook/flipper/issues/4754
* https://github.com/facebook/flipper/issues/4753
* https://github.com/facebook/flipper/issues/4752
* https://github.com/facebook/flipper/issues/4751
* __->__ https://github.com/facebook/flipper/issues/4750
* https://github.com/facebook/flipper/issues/4749

Reviewed By: antonk52

Differential Revision: D46067505

Pulled By: passy

fbshipit-source-id: b673535ac9bd08a35bdb61b9a9ec0a38c957ceef
This commit is contained in:
Pascal Hartig
2023-05-22 06:19:41 -07:00
committed by Facebook GitHub Bot
parent cd3cd44e98
commit 5be3b4b0f0
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/android-sample.yml vendored
View File

@@ -11,7 +11,7 @@ jobs:
- name: set up JDK - name: set up JDK
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 11 java-version: 17
- name: Compute build cache - name: Compute build cache
run: ./scripts/checksum-android.sh checksum-android.txt run: ./scripts/checksum-android.sh checksum-android.txt
- uses: actions/cache@v2 - uses: actions/cache@v2

2
.github/workflows/publish-android.yml vendored
View File

@@ -21,7 +21,7 @@ jobs:
- name: set up JDK - name: set up JDK
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 11 java-version: 17
- name: Write GPG Sec Ring - name: Write GPG Sec Ring
run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg
- name: Update gradle.properties - name: Update gradle.properties

3
gradle.properties
View File

@@ -27,7 +27,8 @@ NDK_VERSION=25.1.8937393
# Gradle internals # Gradle internals
org.gradle.internal.repository.max.retries=10 org.gradle.internal.repository.max.retries=10
org.gradle.internal.repository.initial.backoff=1250 org.gradle.internal.repository.initial.backoff=1250
org.gradle.jvmargs=-Xmx2g -Xms512m -XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled # The --add-opens is required for Litho's annotation processor on JDK 17
org.gradle.jvmargs=-Xmx2g -Xms512m --add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
systemProp.org.gradle.internal.http.connectionTimeout=120000 systemProp.org.gradle.internal.http.connectionTimeout=120000
systemProp.org.gradle.internal.http.socketTimeout=120000 systemProp.org.gradle.internal.http.socketTimeout=120000
android.useAndroidX=true android.useAndroidX=true