Skip to content

Commit c5b228d

Browse files
a-mauricejonsimantov
andauthoredSep 26, 2024··
Update Gradle versions to 7 (#1650)
* Update gradle versions to 7 * Update Java version and buildToolsVersion * Update integration_tests.yml * Update integration_tests.yml * More fixes * Update google services dependency version * Remove logic to set ANDROID_SDK_HOME * Update minSdkVersion. * Try working around a build tools error on Windows. * Call d8 directly via java instead of by broken shell script. * Add note about minSdkVersion. * Change Java version in CI build too. --------- Co-authored-by: Jon Simantov <[email protected]>
1 parent 06ab3ec commit c5b228d

File tree

71 files changed

+329
-240
lines changed

Some content is hidden

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

71 files changed

+329
-240
lines changed
 

Diff for: ‎.github/workflows/android.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ jobs:
5454
- name: setup Xcode version (macos)
5555
if: runner.os == 'macOS'
5656
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
57-
- name: Force Java 8 (macOS)
58-
if: startsWith(matrix.os, 'macos')
57+
- name: Force Java 11
5958
shell: bash
60-
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
59+
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
6160
- name: Store git credentials for all git commands
6261
# Forces all git commands to use authenticated https, to prevent throttling.
6362
shell: bash

Diff for: ‎.github/workflows/cpp-packaging.yml

+3
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,9 @@ jobs:
248248
strategy:
249249
fail-fast: false
250250
steps:
251+
- name: Force Java 11
252+
shell: bash
253+
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
251254
- name: fetch SDK
252255
uses: actions/checkout@v3
253256
with:

0 commit comments

Comments
 (0)
Please sign in to comment.