Merge pull request #13789 from Simonx22/update-sdk36-gradle813

Android: Bump SDK to 36 and Gradle to 8.13
This commit is contained in:
JosJuice 2025-07-26 11:19:44 +02:00 committed by GitHub
commit a6642d5f79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions

View file

@ -7,7 +7,7 @@ plugins {
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
android { android {
compileSdkVersion = "android-34" compileSdkVersion = "android-36"
ndkVersion = "27.0.12077973" ndkVersion = "27.0.12077973"
buildFeatures { buildFeatures {
@ -40,7 +40,7 @@ android {
defaultConfig { defaultConfig {
applicationId = "org.dolphinemu.dolphinemu" applicationId = "org.dolphinemu.dolphinemu"
minSdk = 21 minSdk = 21
targetSdk = 34 targetSdk = 36
versionCode = getBuildVersionCode() versionCode = getBuildVersionCode()

View file

@ -1,9 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.android.application") version "8.9.0" apply false id("com.android.application") version "8.11.0" apply false
id("com.android.library") version "8.9.0" apply false id("com.android.library") version "8.11.0" apply false
id("org.jetbrains.kotlin.android") version "1.8.21" apply false id("org.jetbrains.kotlin.android") version "1.8.21" apply false
id("com.android.test") version "8.9.0" apply false id("com.android.test") version "8.11.0" apply false
id("androidx.baselineprofile") version "1.3.3" apply false id("androidx.baselineprofile") version "1.3.3" apply false
} }

View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME