From 2b2ddb581d1b20e727a66740b06d4260efe43bae Mon Sep 17 00:00:00 2001
From: briar <205427297+icybriarr@users.noreply.github.com>
Date: Mon, 31 Mar 2025 02:45:15 +0200
Subject: [PATCH] android: Update various deps
---
src/android/app/build.gradle.kts | 10 +++++-----
src/android/build.gradle.kts | 7 ++++---
src/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index cb026211cc..0a8b469daf 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -27,7 +27,7 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn
android {
namespace = "org.yuzu.yuzu_emu"
- compileSdkVersion = "android-34"
+ compileSdkVersion = "android-35"
ndkVersion = "26.1.10909125"
buildFeatures {
@@ -35,12 +35,12 @@ android {
}
compileOptions {
- sourceCompatibility = JavaVersion.VERSION_17
- targetCompatibility = JavaVersion.VERSION_17
+ sourceCompatibility = JavaVersion.VERSION_21
+ targetCompatibility = JavaVersion.VERSION_21
}
kotlinOptions {
- jvmTarget = "17"
+ jvmTarget = "21"
}
packaging {
@@ -56,7 +56,7 @@ android {
// TODO If this is ever modified, change application_id in strings.xml
applicationId = "org.yuzu.yuzu_emu"
minSdk = 30
- targetSdk = 34
+ targetSdk = 35
versionName = getGitVersion()
versionCode = if (System.getenv("AUTO_VERSIONED") == "true") {
diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts
index b77906ed6d..051695d2d1 100644
--- a/src/android/build.gradle.kts
+++ b/src/android/build.gradle.kts
@@ -3,8 +3,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id("com.android.application") version "8.1.2" apply false
- id("com.android.library") version "8.1.2" apply false
+ id("com.android.application") version "8.9.1" apply false
+ id("com.android.library") version "8.1.4" apply false
id("org.jetbrains.kotlin.android") version "1.9.20" apply false
}
@@ -13,10 +13,11 @@ tasks.register("clean").configure {
}
buildscript {
+ val agp_version by extra("8.9.1")
repositories {
google()
}
dependencies {
- classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0")
+ classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.8.9")
}
}
diff --git a/src/android/gradle/wrapper/gradle-wrapper.properties b/src/android/gradle/wrapper/gradle-wrapper.properties
index 578c71b941..3887de798b 100644
--- a/src/android/gradle/wrapper/gradle-wrapper.properties
+++ b/src/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip