From 5b4ff1d01ab2d3cbd524b4f9c999530185c14aa2 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Fri, 15 Aug 2025 17:34:04 +0530 Subject: [PATCH 1/2] chore: update gradle and kotlin --- .../auth/android/gradle/wrapper/gradle-wrapper.properties | 2 +- mobile/apps/auth/android/settings.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/apps/auth/android/gradle/wrapper/gradle-wrapper.properties b/mobile/apps/auth/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef0..3c85cfe057 100644 --- a/mobile/apps/auth/android/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/apps/auth/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip diff --git a/mobile/apps/auth/android/settings.gradle b/mobile/apps/auth/android/settings.gradle index 748caceba7..3ddaae5aa3 100644 --- a/mobile/apps/auth/android/settings.gradle +++ b/mobile/apps/auth/android/settings.gradle @@ -19,8 +19,8 @@ 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.8.22" apply false + id "com.android.application" version "8.6.0" apply false + id "org.jetbrains.kotlin.android" version "2.1.10" apply false } include ":app" From 3132373c2627af17298a665f742472ca3561f465 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Fri, 15 Aug 2025 18:13:08 +0530 Subject: [PATCH 2/2] chore: update plugins & add desugaring --- mobile/apps/auth/android/app/build.gradle | 8 ++++- mobile/apps/auth/lib/utils/platform_util.dart | 4 +-- mobile/apps/auth/pubspec.lock | 33 ++++++++++--------- mobile/apps/auth/pubspec.yaml | 27 +++++++++------ 4 files changed, 44 insertions(+), 28 deletions(-) diff --git a/mobile/apps/auth/android/app/build.gradle b/mobile/apps/auth/android/app/build.gradle index 3da027f155..4633c502f3 100644 --- a/mobile/apps/auth/android/app/build.gradle +++ b/mobile/apps/auth/android/app/build.gradle @@ -34,6 +34,9 @@ android { ndkVersion flutter.ndkVersion compileOptions { + // Flag to enable support for the new language APIs + coreLibraryDesugaringEnabled true + // Sets Java compatibility to Java 8 sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -115,4 +118,7 @@ flutter { source '../..' } -dependencies {} +dependencies { + // For AGP 7.4+ + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") +} diff --git a/mobile/apps/auth/lib/utils/platform_util.dart b/mobile/apps/auth/lib/utils/platform_util.dart index bad3c8e738..40ae35ae53 100644 --- a/mobile/apps/auth/lib/utils/platform_util.dart +++ b/mobile/apps/auth/lib/utils/platform_util.dart @@ -59,14 +59,14 @@ class PlatformUtil { if (Platform.isAndroid || Platform.isIOS) { await FileSaver.instance.saveAs( name: fileName, - ext: extension, + fileExtension: extension, bytes: bytes, mimeType: type, ); } else { await FileSaver.instance.saveFile( name: fileName, - ext: extension, + fileExtension: extension, bytes: bytes, mimeType: type, ); diff --git a/mobile/apps/auth/pubspec.lock b/mobile/apps/auth/pubspec.lock index b8a9a9f6f0..24dcf85ffe 100644 --- a/mobile/apps/auth/pubspec.lock +++ b/mobile/apps/auth/pubspec.lock @@ -470,10 +470,10 @@ packages: dependency: "direct main" description: name: file_saver - sha256: "448b1e30142cffe52f37ee085ea9ca50670d5425bb09b649d193549b2dcf6e26" + sha256: "9d93db09bd4da9e43238f9dd485360fc51a5c138eea5ef5f407ec56e58079ac0" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.3.1" fixnum: dependency: "direct main" description: @@ -485,10 +485,11 @@ packages: fk_user_agent: dependency: "direct main" description: - name: fk_user_agent - sha256: fd6c94e120786985a292d12f61422a581f4e851148d5940af38b819357b8ad0d - url: "https://pub.dev" - source: hosted + path: "." + ref: "458046cd9a88924e5074d96ba45397219d53b230" + resolved-ref: "458046cd9a88924e5074d96ba45397219d53b230" + url: "https://github.com/flutter-fast-kit/fk_user_agent" + source: git version: "2.1.0" flutter: dependency: "direct main" @@ -1081,10 +1082,11 @@ packages: move_to_background: dependency: "direct main" description: - name: move_to_background - sha256: "00caad17a6ce149910777131503f43f8ed80025681f94684e3a6a87d979b914c" - url: "https://pub.dev" - source: hosted + path: "." + ref: "91e4d1a9c55b28bf93425d1f12faf410efc1e48d" + resolved-ref: "91e4d1a9c55b28bf93425d1f12faf410efc1e48d" + url: "https://github.com/Sayegh7/move_to_background" + source: git version: "1.0.2" native_dio_adapter: dependency: "direct main" @@ -1329,11 +1331,12 @@ packages: qr_code_scanner: dependency: "direct main" description: - name: qr_code_scanner - sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd - url: "https://pub.dev" - source: hosted - version: "1.0.1" + path: "." + ref: a2d31633d4744f72ada87cfa85d221358ab082af + resolved-ref: a2d31633d4744f72ada87cfa85d221358ab082af + url: "https://github.com/juliuscanute/qr_code_scanner" + source: git + version: "1.0.0" qr_flutter: dependency: "direct main" description: diff --git a/mobile/apps/auth/pubspec.yaml b/mobile/apps/auth/pubspec.yaml index 4feeb58eb4..03afdaad57 100644 --- a/mobile/apps/auth/pubspec.yaml +++ b/mobile/apps/auth/pubspec.yaml @@ -1,4 +1,3 @@ - name: ente_auth description: ente two-factor authenticator version: 4.4.3+443 @@ -8,12 +7,12 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - adaptive_theme: ^3.1.0 # done + adaptive_theme: ^3.1.0 app_links: ^6.3.3 archive: ^4.0.7 auto_size_text: ^3.0.0 base32: ^2.1.3 - bip39: ^1.0.6 #done + bip39: ^1.0.6 bloc: ^9.0.0 clipboard: ^0.1.3 collection: ^1.18.0 # dart @@ -34,10 +33,12 @@ dependencies: ffi: ^2.1.0 figma_squircle: ^0.6.3 file_picker: ^10.2.0 - # https://github.com/incrediblezayed/file_saver/issues/86 - file_saver: ^0.3.0 + file_saver: ^0.3.1 fixnum: ^1.1.0 - fk_user_agent: ^2.1.0 + fk_user_agent: # no package updates on pub.dev + git: + url: https://github.com/flutter-fast-kit/fk_user_agent + ref: 458046cd9a88924e5074d96ba45397219d53b230 flutter: sdk: flutter flutter_animate: ^4.1.0 @@ -53,7 +54,7 @@ dependencies: path: flutter_inappwebview ref: 3e6c4c4a25340cd363af9d38891d88498b90be26 flutter_launcher_icons: ^0.14.1 - flutter_local_authentication: + flutter_local_authentication: # linux fprintd fix is not published on pub.dev git: url: https://github.com/eaceto/flutter_local_authentication ref: 1ac346a04592a05fd75acccf2e01fa3c7e955d96 @@ -77,7 +78,10 @@ dependencies: local_auth_darwin: ^1.2.2 logging: ^1.0.1 modal_bottom_sheet: ^3.0.0 - move_to_background: ^1.0.2 + move_to_background: # no package updates on pub.dev + git: + url: https://github.com/Sayegh7/move_to_background + ref: 91e4d1a9c55b28bf93425d1f12faf410efc1e48d native_dio_adapter: ^1.4.0 otp: ^3.1.1 package_info_plus: ^8.0.2 @@ -88,8 +92,11 @@ dependencies: pointycastle: ^3.7.3 privacy_screen: ^0.0.6 protobuf: ^4.1.0 - qr_code_scanner: ^1.0.1 - qr_flutter: ^4.1.0 + qr_code_scanner: # no package updates on pub.dev + git: + url: https://github.com/juliuscanute/qr_code_scanner + ref: a2d31633d4744f72ada87cfa85d221358ab082af + qr_flutter: ^4.1.0 sentry: ^8.14.2 sentry_flutter: ^8.14.2 share_plus: ^11.0.0