upgrade gecko. gradle, deps

2026-07-09 15:30:34 +02:00
parent 7a2998857f
commit 277585fc05
41 changed files with 166 additions and 157 deletions
@@ -1,7 +1,6 @@
 plugins {
    id "com.android.application"
-    id "kotlin-android"
-    id "org.jetbrains.kotlin.plugin.compose" version "2.3.21"
+    id "org.jetbrains.kotlin.plugin.compose" version "2.4.0"
    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
    id "dev.flutter.flutter-gradle-plugin"
 }
@@ -28,7 +27,7 @@ def weblibreGoMobileAar = file("../../../../native/go_mobile_runtime/build/webli

 android {
    namespace = "eu.weblibre.gecko"
-    compileSdk = 36
+    compileSdk = 37
    ndkVersion = rootProject.ext.ndkVersion

    compileOptions {
@@ -36,16 +35,12 @@ android {
        targetCompatibility JavaVersion.VERSION_17
    }

-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
    defaultConfig {
        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
        applicationId = "eu.weblibre.gecko"
        // https://api.flutter.dev/flutter/widgets/AndroidView-class.html
        minSdkVersion = 26
-        targetSdk = 36
+        targetSdk = 37
        versionCode = flutterVersionCode.toInteger()
        versionName = flutterVersionName
    }
@@ -134,6 +129,12 @@ android {
    }
 }

+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
 flutter {
    source = "../.."
 }
@@ -1,14 +1,10 @@
 //Required by background_fetch build
 ext {
-    compileSdkVersion   = 36
-    targetSdkVersion    = 36
+    compileSdkVersion   = 37
+    targetSdkVersion    = 37
    ndkVersion          = providers.gradleProperty("weblibre.ndkVersion").get()
 }

-buildscript {
-    ext.kotlin_version = '2.3.21'
-}
-
 allprojects {
    repositories {
        google()
@@ -22,7 +18,7 @@ allprojects {
            if (details.requested.group == 'androidx.glance' &&
                    details.requested.name == 'glance-appwidget') {
                details.useVersion '1.1.1'
-                details.because 'home_widget uses 1.+ and newer alpha releases require AGP 9.1 and compileSdk 37'
+                details.because 'home_widget uses 1.+; keep a stable Glance version for reproducible Android builds'
            }
        }
    }
@@ -34,7 +30,7 @@ subprojects {
    afterEvaluate {
        if (it.hasProperty("android")) {
            android {
-                compileSdkVersion 36
+                compileSdkVersion 37
                ndkVersion rootProject.ext.ndkVersion
            }
        }
@@ -2,7 +2,5 @@ org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 weblibre.ndkVersion=28.2.13676358
 android.useAndroidX=true
 android.enableJetifier=true
-# This builtInKotlin flag was added automatically by Flutter migrator
 android.builtInKotlin=false
-# This newDsl flag was added automatically by Flutter migrator
 android.newDsl=false
@@ -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.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
@@ -18,8 +18,8 @@ pluginManagement {

 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.13.2' apply false
-    id "org.jetbrains.kotlin.android" version "2.3.21" apply false
+    id "com.android.application" version '9.2.1' apply false
+    id "org.jetbrains.kotlin.android" version "2.4.0" apply false
 }

 include ":app"
@@ -17,7 +17,7 @@ dependencies:
  country_flags: ^4.1.2
  crypto: ^3.0.7
  cryptography_flutter: ^2.3.4
-  device_info_plus: ^13.1.0
+  device_info_plus: ^13.2.0
  drift: 2.34.0
  drift_dev: 2.34.0
  dynamic_color: ^1.8.1
@@ -25,7 +25,7 @@ dependencies:
  fading_scroll: ^0.9.4
  fancy_password_field: ^2.0.8
  fast_equatable: ^1.3.1
-  file_picker: 12.0.0-beta.5
+  file_picker: ^12.0.0-beta.7
  flutter:
    sdk: flutter
  flutter_auto_size_text: ^5.0.0
@@ -50,7 +50,7 @@ dependencies:
  hooks_riverpod: ^3.3.2
  html: ^0.15.6
  http: ^1.6.0
-  intl: ^0.20.2
+  intl: ^0.20.3
  json_annotation: ^4.12.0
  lexo_rank:
    git:
@@ -63,7 +63,7 @@ dependencies:
  material_color_utilities: ^0.13.0
  mime: ^2.0.0
  nullability: ^1.0.0
-  package_info_plus: ^10.1.0
+  package_info_plus: ^10.2.0
  path: ^1.9.1
  path_provider: ^2.1.6
  permission_handler: ^12.0.3
@@ -71,32 +71,32 @@ dependencies:
  privacypass_client:
    git:
      url: https://gitlab.com/weblibre/search_client.git
-      ref: 1b323c7cb2a520e33a7e7fce37a080c9e6e7f2e8
+      ref: a0e4afe03a24b5f0f7ecd3b24317072e8ee00bbd
      path: packages/privacypass_client
-  qr_code_scanner_plus: ^2.1.2
+  qr_code_scanner_plus: ^2.2.0
  quick_actions: ^1.1.0
  riverpod: ^3.3.2
  riverpod_annotation: ^4.0.3
  rss_dart: ^1.0.14
  rxdart: ^0.28.0
-  saf_stream: ^3.0.0
+  saf_stream: ^3.1.0
  saf_util: ^3.1.0
  search_client:
    git:
      url: https://gitlab.com/weblibre/search_client.git
-      ref: 1b323c7cb2a520e33a7e7fce37a080c9e6e7f2e8
+      ref: a0e4afe03a24b5f0f7ecd3b24317072e8ee00bbd
      path: packages/search_client
  search_protocol:
    git:
      url: https://gitlab.com/weblibre/search_client.git
-      ref: 1b323c7cb2a520e33a7e7fce37a080c9e6e7f2e8
+      ref: a0e4afe03a24b5f0f7ecd3b24317072e8ee00bbd
      path: packages/search_protocol
  secure_archive:
    git:
      url: https://github.com/FaFre/secure_archive.git
      path: packages/secure_archive
      ref: 0c515813ac2d29e29ab1c66759a396af825bf8b3
-  share_plus: ^13.1.0
+  share_plus: ^13.2.0
  simple_intent_receiver:
    path: ../../packages/simple_intent_receiver
  skeletonizer: ^2.1.3
@@ -105,8 +105,8 @@ dependencies:
  socks5_proxy: ^2.1.1
  speech_to_text_dialog:
    path: ../../packages/speech_to_text_dialog
-  sqlite3: ^3.3.3
-  supabase: ^2.13.0
+  sqlite3: ^3.3.4
+  supabase: ^2.14.0
  synchronized: ^3.4.1
  text_scroll: ^0.2.1
  timeago: ^3.7.1
@@ -119,7 +119,7 @@ dependencies:
  xxh3: ^1.2.0

 dev_dependencies:
-  build_runner: ^2.15.0
+  build_runner: ^2.15.1
  copy_with_extension_gen: ^15.0.1
  flutter_launcher_icons: ^0.14.4
  flutter_test:
@@ -63,8 +63,6 @@ void main() {
                openedUris.add(uri);
              },
              onFetch: (_) async {},
-              onPreview: (_) async {},
-              onOpenCapture: (_) async {},
            ),
          ),
        ),
@@ -114,8 +112,6 @@ void main() {
                ),
                onOpen: (_) async {},
                onFetch: (_) async {},
-                onPreview: (_) async {},
-                onOpenCapture: (_) async {},
              ),
            ),
          ),