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.

Sign up for GitHub

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

Bump Android SDK to 34 #395

Merged
merged 2 commits into from
Jul 11, 2024
Merged

Bump Android SDK to 34 #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fafcb3a
Bump Android SDK to 34
jperedadnr Jul 10, 2024
bfa99bf
bump macos runner
jperedadnr Jul 11, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:
name: Build
runs-on: macos-11
runs-on: macos-latest
strategy:
fail-fast: false
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
build:
name: Deploy
runs-on: macos-11
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion gradle/android_project/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/android_project/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions gradle/android_project/library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ android {

namespace 'com.gluonhq.helloandroid'

compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion gradle/native-build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions modules/augmented-reality/src/main/resources/META-INF/substrate/dalvik/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ android {

namespace 'com.gluonhq.helloandroid'

compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
}

compileOptions {
Expand Down
4 changes: 2 additions & 2 deletions modules/barcode-scan/src/main/resources/META-INF/substrate/dalvik/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ android {

namespace 'com.gluonhq.helloandroid'

compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions modules/push-notifications/src/main/resources/META-INF/substrate/dalvik/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ android {

namespace 'com.gluonhq.helloandroid'

compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
}

buildFeatures {
Expand Down
4 changes: 2 additions & 2 deletions modules/store-review/src/main/resources/META-INF/substrate/dalvik/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ android {

namespace 'com.gluonhq.helloandroid'

compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
}

buildFeatures {
Expand Down
Loading