Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: java/node version update #14104

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/actions/build-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
run: |
sudo dpkg --add-architecture i386
sudo apt-get update -y -qq
sudo apt-get install -y -qq gperf libatomic1:i386 libc6:i386 libncurses5:i386 libstdc++6:i386
sudo apt-get install -y -qq gperf
shell: bash

- name: Setup Node.js
Expand All @@ -26,9 +26,10 @@ runs:
cache: 'npm'

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
java-version: ${{ inputs.java-version }}

- name: Install dependencies
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ on:

jobs:
android:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
USE_CCACHE: 1
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Android build
uses: ./.github/actions/build-android
with:
node-version: '16.x'
java-version: '11'
node-version: '20.x'
java-version: '17'

ios:
runs-on: macos-13
Expand All @@ -33,27 +33,27 @@ jobs:
DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: iOS build
uses: ./.github/actions/build-ios
with:
node-version: '16.x'
node-version: '20.x'

js:
runs-on: ubuntu-latest
name: JavaScript
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: '20.x'
cache: 'npm'

- name: Install dependencies
Expand All @@ -71,7 +71,7 @@ jobs:
needs: [android, ios, js]
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Create version tag
Expand All @@ -83,6 +83,6 @@ jobs:
- name: Package
uses: ./.github/actions/package
with:
node-version: '16.x'
java-version: '11'
node-version: '20.x'
java-version: '17'
vtag: ${{ env.vtag }}
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:7.1.3'
classpath 'com.google.gms:google-services:4.3.15'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'org.codehaus.groovy:groovy-json:3.0.11'
Expand Down
8 changes: 4 additions & 4 deletions android/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"minSDKVersion": "21",
"compileSDKVersion": "33",
"vendorDependencies": {
"android sdk": ">=23.x <=34.x",
"android build tools": ">=30.0.2 <=34.x",
"android platform tools": "33.x",
"android tools": "<=34.x",
"android sdk": ">=23 <=34",
"android build tools": ">=30.0.2 <=34",
"android platform tools": "33",
"android tools": "<=34",
"android ndk": ">=r21 <=r22b",
"java": ">=11.x"
},
Expand Down
2 changes: 1 addition & 1 deletion android/templates/build/root.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.android.tools.build:gradle:7.1.3'
classpath 'com.google.gms:google-services:4.3.10'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
Loading