From 407db9cd61688738b4b923d56d65047061950b18 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Mon, 8 Sep 2025 13:39:20 +0200 Subject: [PATCH] Bump kotlin, SDK, NDK and gradle versions --- android/app/build.gradle | 8 +++----- android/gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ce9cc658..da8fd1dc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -23,8 +23,8 @@ if (keystorePropertiesFile.exists()) { android { namespace = "de.wger.flutter" - compileSdkVersion 35 - ndkVersion "27.0.12077973" + compileSdkVersion 36 + ndkVersion "28.2.13676358" compileOptions { sourceCompatibility JavaVersion.VERSION_11 @@ -39,9 +39,7 @@ android { defaultConfig { // Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "de.wger.flutter" - // NOTE: manually setting the minSdk to 23 instead of "flutter.minSdkVersion" - // because flutter_zxing requires a higher minSdkVersion. - minSdk = 23 + minSdkVersion = flutter.minSdkVersion targetSdk = flutter.targetSdkVersion versionCode = flutter.versionCode versionName = flutter.versionName diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 9c5194d3..d5ce57cb 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/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.4-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index b5e1b3f5..ed68c2f2 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.3.2" apply false - id "org.jetbrains.kotlin.android" version "2.0.20" apply false + id "com.android.application" version "8.6.0" apply false + id "org.jetbrains.kotlin.android" version "2.1.20" apply false } include ":app"