diff --git a/.github/actions/build-android/action.yml b/.github/actions/build-android/action.yml index ac6d0389498..6de1ede1e9a 100644 --- a/.github/actions/build-android/action.yml +++ b/.github/actions/build-android/action.yml @@ -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 @@ -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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0c0afcb02d..4767ba09b1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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 @@ -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 @@ -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 }} diff --git a/android/build.gradle b/android/build.gradle index 319eec9c71a..d0573a4e600 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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' diff --git a/android/package.json b/android/package.json index cb890f2d580..ea4374c1c86 100644 --- a/android/package.json +++ b/android/package.json @@ -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" }, diff --git a/android/templates/build/root.build.gradle b/android/templates/build/root.build.gradle index 8df90e3f35f..eea9ffcf8bc 100644 --- a/android/templates/build/root.build.gradle +++ b/android/templates/build/root.build.gradle @@ -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" }