From e5489b4804de5df250e4715e45ad9add4103e667 Mon Sep 17 00:00:00 2001 From: Hannes Van den Berghe Date: Mon, 9 Feb 2026 12:17:54 +0100 Subject: [PATCH 1/2] feat: gradle bump --- android/gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 6b665338..bc658507 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index dd496b31..a82b9e33 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,9 +18,9 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.9.0" apply false - id "com.google.gms.google-services"version "4.3.8" apply false + id "com.android.application" version "8.7.0" apply false + id "org.jetbrains.kotlin.android" version "2.1.0" apply false + id "com.google.gms.google-services"version "4.4.2" apply false id "com.google.firebase.crashlytics" version "2.9.9" apply false } From 07adfee2fa8200c9bc28a6888e0ad578cd13342d Mon Sep 17 00:00:00 2001 From: Hannes Van den Berghe Date: Mon, 9 Feb 2026 12:36:29 +0100 Subject: [PATCH 2/2] Update gradle version --- android/app/build.gradle | 21 ++++++++++++++++++--- android/gradle.properties | 1 + pubspec.lock | 17 ++++++++--------- pubspec.yaml | 5 +---- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bf5cbb3b..3d42c2b7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -24,8 +24,10 @@ if (flutterVersionName == null) { } android { - buildToolsVersion "30.0.0" - compileSdkVersion 34 + buildToolsVersion "34.0.0" + compileSdkVersion 36 + ndkVersion "29.0.14033849" + namespace "com.icapps.fluttertemplate" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -39,7 +41,7 @@ android { defaultConfig { applicationId "com.icapps.fluttertemplate" minSdkVersion flutter.minSdkVersion - targetSdkVersion 34 + targetSdkVersion 35 multiDexEnabled true versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -93,6 +95,19 @@ android { dimension "flavors" } } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17 + } + + buildFeatures { + buildConfig = true + } } flutter { diff --git a/android/gradle.properties b/android/gradle.properties index b6e61b62..3d9f097c 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -2,3 +2,4 @@ android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M android.enableR8=true +kotlin.jvm.target.validation.mode=IGNORE \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 0e642278..e32e63c8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -514,10 +514,10 @@ packages: dependency: transitive description: name: flutter_key_value_file_storage - sha256: a39cb3814eae20aa58747c874235d94411955df4bb287afb3aab12f1f2bbdfe6 + sha256: bd41274a2f11e45d146d8f1da7a063790a398007fd2fe404f384b9672e4e2b53 url: "https://pub.dev" source: hosted - version: "0.0.8" + version: "0.1.0" flutter_launcher_icons: dependency: "direct dev" description: @@ -559,10 +559,10 @@ packages: dependency: transitive description: name: flutter_secure_file_storage - sha256: ea582e959c9ab8916041bf39c93ce0e5ccbd9e93c38d8424ef48b4cb4dd6a0c6 + sha256: b44256b8d599bfbd3404f56729ccd35a800b8b20f7c2a72e2db9c9c00e5ed7fd url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" flutter_secure_storage: dependency: "direct main" description: @@ -848,11 +848,10 @@ packages: log_to_secure_file: dependency: "direct main" description: - path: "." - ref: main - resolved-ref: "44e7f61a7c31e474274f613fcdd15bdd758e8a50" - url: "https://github.com/icapps/log_to_secure_file.git" - source: git + name: log_to_secure_file + sha256: "28d5e7330d0e8271b8e4d86538db3941e7f637da1b3ba0898f708a28dfb0e2c6" + url: "https://pub.dev" + source: hosted version: "1.0.0" logger: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index d0e244e3..bea482d4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -41,10 +41,7 @@ dependencies: injectable: ^2.1.0 intl: ^0.19.0 json_annotation: ^4.7.0 - log_to_secure_file: - git: - url: https://github.com/icapps/log_to_secure_file.git - ref: main + log_to_secure_file: ^1.0.0 niddler_dart: ^1.6.0 path: ^1.8.2 path_provider: ^2.0.11