From 202989e0d4ca7d72dc12bfe4b55ac54e93930b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pereda?= Date: Thu, 11 Jul 2024 10:16:16 +0200 Subject: [PATCH] Bump Android SDK to 34 (#395) * Bump Android SDK to 34 * bump macos runner --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- gradle/android_project/build.gradle | 2 +- .../android_project/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/android_project/library/build.gradle | 4 ++-- gradle/native-build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../src/main/resources/META-INF/substrate/dalvik/build.gradle | 4 ++-- .../src/main/resources/META-INF/substrate/dalvik/build.gradle | 4 ++-- .../src/main/resources/META-INF/substrate/dalvik/build.gradle | 4 ++-- .../src/main/resources/META-INF/substrate/dalvik/build.gradle | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb38caaf..976428bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: jobs: build: name: Build - runs-on: macos-11 + runs-on: macos-latest strategy: fail-fast: false steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4e9885e..4e509ff3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: build: name: Deploy - runs-on: macos-11 + runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v2 diff --git a/gradle/android_project/build.gradle b/gradle/android_project/build.gradle index 2e993cfa..4dff3c73 100644 --- a/gradle/android_project/build.gradle +++ b/gradle/android_project/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.1' + classpath 'com.android.tools.build:gradle:8.5.0' } } diff --git a/gradle/android_project/gradle/wrapper/gradle-wrapper.properties b/gradle/android_project/gradle/wrapper/gradle-wrapper.properties index 7666e22b..45181329 100644 --- a/gradle/android_project/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/android_project/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip diff --git a/gradle/android_project/library/build.gradle b/gradle/android_project/library/build.gradle index 3ad670d1..cc1d38d5 100644 --- a/gradle/android_project/library/build.gradle +++ b/gradle/android_project/library/build.gradle @@ -4,11 +4,11 @@ android { namespace 'com.gluonhq.helloandroid' - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 } dependencies { diff --git a/gradle/native-build.gradle b/gradle/native-build.gradle index e510539e..ec40368c 100644 --- a/gradle/native-build.gradle +++ b/gradle/native-build.gradle @@ -13,7 +13,7 @@ def sdkPath(String platform) { return "/Applications/Xcode.app/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${IOS_VERSION}.sdk"; } -def AndroidPlatform = 31 +def AndroidPlatform = 34 task androidBuild { group = "native" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b82..48c0a02c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/modules/augmented-reality/src/main/resources/META-INF/substrate/dalvik/build.gradle b/modules/augmented-reality/src/main/resources/META-INF/substrate/dalvik/build.gradle index 68ddd402..9ef9f665 100644 --- a/modules/augmented-reality/src/main/resources/META-INF/substrate/dalvik/build.gradle +++ b/modules/augmented-reality/src/main/resources/META-INF/substrate/dalvik/build.gradle @@ -4,11 +4,11 @@ android { namespace 'com.gluonhq.helloandroid' - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 } compileOptions { diff --git a/modules/barcode-scan/src/main/resources/META-INF/substrate/dalvik/build.gradle b/modules/barcode-scan/src/main/resources/META-INF/substrate/dalvik/build.gradle index 287faddd..0ae74c9d 100644 --- a/modules/barcode-scan/src/main/resources/META-INF/substrate/dalvik/build.gradle +++ b/modules/barcode-scan/src/main/resources/META-INF/substrate/dalvik/build.gradle @@ -4,11 +4,11 @@ android { namespace 'com.gluonhq.helloandroid' - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 } dependencies { diff --git a/modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/build.gradle b/modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/build.gradle index 7b202214..8c6d9193 100644 --- a/modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/build.gradle +++ b/modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/build.gradle @@ -4,11 +4,11 @@ android { namespace 'com.gluonhq.helloandroid' - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 } buildFeatures { diff --git a/modules/store-review/src/main/resources/META-INF/substrate/dalvik/build.gradle b/modules/store-review/src/main/resources/META-INF/substrate/dalvik/build.gradle index a7117902..1e8a8b3d 100644 --- a/modules/store-review/src/main/resources/META-INF/substrate/dalvik/build.gradle +++ b/modules/store-review/src/main/resources/META-INF/substrate/dalvik/build.gradle @@ -4,11 +4,11 @@ android { namespace 'com.gluonhq.helloandroid' - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 } buildFeatures {