plugin ref update (gradle and kotlin..)

android/app/build.gradle

@@ -1,3 +1,11 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+    id "com.google.gms.google-services"
+    id "com.google.firebase.crashlytics"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -12,10 +20,10 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
+/*def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
+-if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
+}*/
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
@@ -27,14 +35,25 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
+/*apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'*/
 
 android {
+    namespace "be.unov.myinfomate.tablet"
+
     compileSdkVersion 34
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -53,7 +72,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "be.unov.myinfomate.tablet"
-        minSdkVersion 21
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -74,8 +93,9 @@ android {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.release // signingConfigs.release for release, signingConfigs.debug for debug
-            minifyEnabled true
             shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             debuggable false
         }
     }
@@ -86,9 +106,9 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    /*implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"*/
 
-    implementation platform('com.google.firebase:firebase-bom:32.7.0')
+    /*implementation platform('com.google.firebase:firebase-bom:32.7.0')
-    implementation 'com.google.firebase:firebase-analytics'
+    implementation 'com.google.firebase:firebase-analytics'*/
 
 }

android/app/proguard-rules.pro

@@ -0,0 +1,3 @@
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn android.window.BackEvent

android/build.gradle

@@ -1,16 +1,16 @@
-buildscript {
+/*buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '2.0.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:8.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.15'
     }
-}
+}*/
 
 allprojects {
     repositories {

android/settings.gradle

@@ -1,11 +1,30 @@
-include ':app'
+pluginManagement {
-
+    def flutterSdkPath = {
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
         def properties = new Properties()
-
+        file("local.properties").withInputStream { properties.load(it) }
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+        return flutterSdkPath
+    }()
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id 'com.android.application' version '7.2.0' apply false
+    id 'com.android.library' version '7.2.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
+    id "com.google.gms.google-services" version "4.3.15" apply false
+    id "com.google.firebase.crashlytics" version "2.9.9" apply false
+    /*id "com.google.firebase:firebase-bom" version "32.7.0"
+    id "com.google.firebase.firebase-analytics" version "32.7.0"*/
+}
+
+include ":app"

lib/Components/loading.dart

@@ -1,4 +1,4 @@
-import 'package:flare_flutter/flare_actor.dart';
+//import 'package:flare_flutter/flare_actor.dart';
 import 'package:flutter/material.dart';
 
 class Loading extends StatelessWidget {
@@ -11,12 +11,12 @@ class Loading extends StatelessWidget {
       width: size.width,
       height: size.height,
       color: Colors.transparent,
-      child: FlareActor(
+      child: Text("No more supported")/*FlareActor(
         'assets/animations/MDLF_animation.flr',
         alignment: Alignment.center,
         fit: BoxFit.scaleDown,
         animation: 'Rotate',
-      ),
+      )*/,
     );
   }
 }

lib/Services/downloadService.dart

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:manager_api/api.dart';
 //import 'package:ota_update/ota_update.dart';
-import 'package:package_info/package_info.dart';
+//import 'package:package_info/package_info.dart';
 //import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
 import 'package:tablet_app/Models/tabletContext.dart';

macos/Flutter/ephemeral/Flutter-Generated.xcconfig

@@ -3,8 +3,8 @@ FLUTTER_ROOT=C:\PROJ\flutter
 FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\MuseeDeLaFraise\tablet-app
 COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=2.1.0
+FLUTTER_BUILD_NAME=2.1.2
-FLUTTER_BUILD_NUMBER=20
+FLUTTER_BUILD_NUMBER=23
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=true
 TREE_SHAKE_ICONS=false

macos/Flutter/ephemeral/flutter_export_environment.sh

@@ -4,8 +4,8 @@ export "FLUTTER_ROOT=C:\PROJ\flutter"
 export "FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\MuseeDeLaFraise\tablet-app"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=2.1.0"
+export "FLUTTER_BUILD_NAME=2.1.2"
-export "FLUTTER_BUILD_NUMBER=20"
+export "FLUTTER_BUILD_NUMBER=23"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"

pubspec.yaml

@@ -25,23 +25,23 @@ dependencies:
     sdk: flutter
 
   # Specific Mobile
-  sqflite: # Specific mobile and macOS
+  sqflite: # Specific mobile and macOS but _common can be multi
-  webview_flutter: ^4.4.1 # Specific mobile # old : ^3.0.4
+  webview_flutter: ^4.8.0 # Specific mobile # old : ^3.0.4
-  google_maps_flutter: ^2.5.3 # Specific mobile
+  google_maps_flutter: ^2.5.3 # Specific mobile and web
-  youtube_player_flutter: ^9.0.1 # Specific mobile
+  youtube_player_flutter: ^9.0.2 # Specific mobile and web
 
   # Specific Web
   google_maps_flutter_web: ^0.5.4+3 # Specific WEB
   youtube_player_iframe: ^5.1.2 # Handle mobile and web here => TO TEST
 
-  mapbox_maps_flutter: ^2.0.0
+  mapbox_maps_flutter: ^2.0.0 # specific mobile ..
 
   #ota_update: ^6.0.0
-  package_info: ^2.0.2
+  package_info: ^2.0.2 # specific mobile
   #package_info_plus: ^8.0.0 # chewie version casse couille
-  qr_flutter: ^4.1.0
+  qr_flutter: ^4.1.0 # multi
 
-  flare_flutter: ^3.0.2
+  #flare_flutter: ^3.0.2
   provider: ^6.0.5
   http: ^1.2.0
   auto_size_text: ^3.0.0
@@ -66,6 +66,7 @@ dependencies:
   google_fonts: ^6.2.1
   #animated_tree_view: ^2.2.0
   generate_tree: ^2.2.2
+  diacritic: ^0.1.5
 
   openapi_generator_cli: ^5.0.2
   openapi_generator: ^5.0.2