From fd66ea60ded7177349a05b881fb1ba151c733b3c Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Thu, 5 Sep 2024 23:00:33 +0200 Subject: [PATCH 1/7] chore: java/node version update --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0c0afcb02d..ea448fffa4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,8 @@ jobs: - 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 @@ -39,7 +39,7 @@ jobs: - name: iOS build uses: ./.github/actions/build-ios with: - node-version: '16.x' + node-version: '20.x' js: runs-on: ubuntu-latest @@ -50,10 +50,10 @@ jobs: 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 @@ -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 }} From 3664e7fd83b921851cc4060a1d6fdf6cc49ddc8f Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Thu, 5 Sep 2024 23:08:46 +0200 Subject: [PATCH 2/7] java update --- .github/actions/build-android/action.yml | 4 ++-- .github/workflows/build.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/build-android/action.yml b/.github/actions/build-android/action.yml index ac6d0389498..9992520c079 100644 --- a/.github/actions/build-android/action.yml +++ b/.github/actions/build-android/action.yml @@ -26,9 +26,9 @@ runs: cache: 'npm' - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'oracle' java-version: ${{ inputs.java-version }} - name: Install dependencies diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea448fffa4d..e15243a00f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: USE_CCACHE: 1 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Android build @@ -33,7 +33,7 @@ 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 @@ -46,7 +46,7 @@ jobs: name: JavaScript steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -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 From fd36c159a881adb8671d1737b85cd3164aed1730 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Thu, 5 Sep 2024 23:16:49 +0200 Subject: [PATCH 3/7] android build --- .github/actions/build-android/action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-android/action.yml b/.github/actions/build-android/action.yml index 9992520c079..04677f4539a 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 libatomic1:i386 libc6:i386 libncurses5:i386 libstdc++6:i386 shell: bash - name: Setup Node.js @@ -28,7 +28,8 @@ runs: - name: Setup Java uses: actions/setup-java@v4 with: - distribution: 'oracle' + distribution: 'temurin' + cache: 'gradle' java-version: ${{ inputs.java-version }} - name: Install dependencies From bf70a76f723a4f91bbce0eacfe25896ec8af631f Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Thu, 5 Sep 2024 23:20:09 +0200 Subject: [PATCH 4/7] ubuntu version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e15243a00f0..4767ba09b1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: jobs: android: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: CCACHE_DIR: ${{ github.workspace }}/.ccache USE_CCACHE: 1 From e49ee6bca575b44d0ad5b867e04148c100654841 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Thu, 5 Sep 2024 23:25:46 +0200 Subject: [PATCH 5/7] apt --- .github/actions/build-android/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-android/action.yml b/.github/actions/build-android/action.yml index 04677f4539a..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 From c625fadba00ccf4c8fdfc0c19f0758e2c64cf583 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Thu, 5 Sep 2024 23:53:19 +0200 Subject: [PATCH 6/7] package.json --- android/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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" }, From 332605bf4b26a4735ab3566ca2a5dd3f7b52b582 Mon Sep 17 00:00:00 2001 From: Michael Gangolf Date: Fri, 6 Sep 2024 00:00:43 +0200 Subject: [PATCH 7/7] gradle version --- android/build.gradle | 2 +- android/templates/build/root.build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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" }