From dba375c63d56dabe0a320324feb91bf7768ba405 Mon Sep 17 00:00:00 2001 From: Doug Borg Date: Mon, 9 Feb 2026 21:43:51 -0700 Subject: [PATCH 1/3] chore(deps): update app_links and package_info_plus to latest major versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upgrade packages: - app_links: ^6.1.4 → ^7.0.0 (backward compatible with v6) - package_info_plus: ^8.0.0 → ^9.0.0 (build tooling only, no Dart API changes) Bump Android build tooling to latest Flutter 3.38-compatible versions: - AGP: 8.9.1 → 8.11.1 - Gradle: 8.12 → 8.14 - Kotlin: 2.1.0 → 2.2.20 Co-Authored-By: Claude Opus 4.6 --- android/gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle.kts | 4 ++-- pubspec.lock | 8 ++++---- pubspec.yaml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ac3b479..e4ef43f 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.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 43394ed..da20e6d 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -18,8 +18,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.9.1" apply false - id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") diff --git a/pubspec.lock b/pubspec.lock index de36f8e..a337d12 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: "direct main" description: name: app_links - sha256: "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8" + sha256: "3462d9defc61565fde4944858b59bec5be2b9d5b05f20aed190adb3ad08a7abc" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "7.0.0" app_links_linux: dependency: transitive description: @@ -588,10 +588,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968" + sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d url: "https://pub.dev" source: hosted - version: "8.3.1" + version: "9.0.0" package_info_plus_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 3780dff..055a64c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: flutter_local_notifications: ^17.2.2 url_launcher: ^6.3.0 flutter_linkify: ^6.0.0 - app_links: ^6.1.4 + app_links: ^7.0.0 # Auth, storage, prefs oauth2_client: ^4.2.0 @@ -35,7 +35,7 @@ dependencies: path: ^1.8.3 path_provider: ^2.1.0 uuid: ^4.0.0 - package_info_plus: ^8.0.0 + package_info_plus: ^9.0.0 csv: ^6.0.0 collection: ^1.18.0 From b6bcd236678fddc3f20b70a068553e89af52fda6 Mon Sep 17 00:00:00 2001 From: Doug Borg Date: Mon, 9 Feb 2026 21:52:21 -0700 Subject: [PATCH 2/3] chore(android): bump Dart SDK floor, desugar_jdk_libs, and fix Kotlin DSL deprecation - Bump Dart SDK constraint from >=3.8.0 to >=3.10.3 to match resolved dependency floor - Upgrade desugar_jdk_libs from 2.0.4 to 2.1.5 (adds Stream.toList(), better locale support) - Migrate deprecated kotlinOptions { jvmTarget } to kotlin { compilerOptions { jvmTarget } } - Remove stale comments and non-breaking space characters Co-Authored-By: Claude Opus 4.6 --- android/app/build.gradle.kts | 14 ++++++-------- pubspec.lock | 2 +- pubspec.yaml | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index b7f63de..a700f92 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -17,7 +17,6 @@ if (keystorePropertiesFile.exists()) { android { namespace = "me.deflock.deflockapp" - // Matches current stable Flutter (compileSdk 34 as of July 2025) compileSdk = 36 // NDK only needed if you build native plugins; keep your pinned version @@ -28,17 +27,17 @@ android { targetCompatibility = JavaVersion.VERSION_17 isCoreLibraryDesugaringEnabled = true } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } } defaultConfig { // Application ID (package name) applicationId = "me.deflock.deflockapp" - // ──────────────────────────────────────────────────────────── - // oauth2_client 4.x & flutter_web_auth_2 5.x require minSdk 23 - // ──────────────────────────────────────────────────────────── + // oauth2_client 4.x & flutter_web_auth_2 5.x require minSdk 23 minSdk = maxOf(flutter.minSdkVersion, 23) targetSdk = 36 @@ -76,6 +75,5 @@ flutter { } dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") } - diff --git a/pubspec.lock b/pubspec.lock index a337d12..64a68bb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1079,4 +1079,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.10.0 <4.0.0" - flutter: ">=3.38.0" + flutter: ">=3.38.1" diff --git a/pubspec.yaml b/pubspec.yaml index 055a64c..14f81d2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 2.7.2+48 # The thing after the + is the version code, incremented with each release environment: - sdk: ">=3.8.0 <4.0.0" # RadioGroup widget requires Dart 3.8+ (Flutter 3.35+) + sdk: ">=3.10.3 <4.0.0" # Resolved dependency floor (Dart 3.10.3 = Flutter 3.38+) dependencies: flutter: From 90a806a10d14aff3276dc18bdc27aaaca1535036 Mon Sep 17 00:00:00 2001 From: Doug Borg Date: Wed, 25 Feb 2026 15:23:00 -0700 Subject: [PATCH 3/3] chore(deps): upgrade minor/patch dependencies within existing constraints Co-Authored-By: Claude Opus 4.6 --- pubspec.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 64a68bb..76982e6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -105,6 +105,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.2" + code_assets: + dependency: transitive + description: + name: code_assets + sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687" + url: "https://pub.dev" + source: hosted + version: "1.0.0" collection: dependency: "direct main" description: @@ -408,6 +416,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.5" + glob: + dependency: transitive + description: + name: glob + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de + url: "https://pub.dev" + source: hosted + version: "2.1.3" gtk: dependency: transitive description: @@ -416,6 +432,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.0" + hooks: + dependency: transitive + description: + name: hooks + sha256: "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6" + url: "https://pub.dev" + source: hosted + version: "1.0.1" html: dependency: transitive description: @@ -528,6 +552,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.6.2" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" matcher: dependency: transitive description: @@ -568,6 +600,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" + native_toolchain_c: + dependency: transitive + description: + name: native_toolchain_c + sha256: "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac" + url: "https://pub.dev" + source: hosted + version: "0.17.4" nested: dependency: transitive description: @@ -584,6 +624,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.2.3" + objective_c: + dependency: transitive + description: + name: objective_c + sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52" + url: "https://pub.dev" + source: hosted + version: "9.3.0" package_info_plus: dependency: "direct main" description: @@ -636,10 +684,10 @@ packages: dependency: transitive description: name: path_provider_foundation - sha256: "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4" + sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.0" path_provider_linux: dependency: transitive description: @@ -712,6 +760,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.5+1" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" + url: "https://pub.dev" + source: hosted + version: "2.2.0" random_string: dependency: transitive description: @@ -1078,5 +1134,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.10.0 <4.0.0" - flutter: ">=3.38.1" + dart: ">=3.10.3 <4.0.0" + flutter: ">=3.38.4"