update gradle version

This commit is contained in:
Thomas Fransolet 2026-04-16 15:05:28 +02:00
parent 1fddd6363f
commit fea161096d
15 changed files with 466 additions and 1258 deletions

View File

@ -43,7 +43,7 @@ apply plugin: 'com.google.gms.google-services'*/
android { android {
namespace "be.unov.myinfomate.tablet" namespace "be.unov.myinfomate.tablet"
compileSdkVersion 34 compileSdkVersion 36
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8

View File

@ -23,12 +23,12 @@ rootProject.buildDir = '../build'
subprojects { subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}" project.buildDir = "${rootProject.buildDir}/${project.name}"
} }
subprojects {
//project.evaluationDependsOn(':app') allprojects {
project.configurations.all { configurations.all {
resolutionStrategy.eachDependency { details -> resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'androidx.lifecycle') { if (details.requested.group == 'androidx.lifecycle') {
details.useVersion '2.4.0' // To fix mapbox issue.. details.useVersion '2.8.7' // Pin to last version with setViewTreeLifecycleOwner
} }
} }
} }

View File

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
android.enableR8=true android.enableR8=true

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

View File

@ -18,9 +18,9 @@ pluginManagement {
plugins { plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id 'com.android.application' version '7.2.0' apply false id 'com.android.application' version '8.9.1' apply false
id 'com.android.library' version '7.2.0' apply false id 'com.android.library' version '8.9.1' apply false
id 'org.jetbrains.kotlin.android' version '1.9.0' apply false id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
id "com.google.gms.google-services" version "4.3.15" 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.crashlytics" version "2.9.9" apply false
/*id "com.google.firebase:firebase-bom" version "32.7.0" /*id "com.google.firebase:firebase-bom" version "32.7.0"

BIN
build_log.txt Normal file

Binary file not shown.

View File

@ -218,6 +218,8 @@ class _MainViewWidget extends State<MainViewWidget> {
Future<ConfigurationDTO?> getCurrentConfiguration(dynamic appContext) async { Future<ConfigurationDTO?> getCurrentConfiguration(dynamic appContext) async {
TabletAppContext tabletAppContext = await appContext.getContext(); TabletAppContext tabletAppContext = await appContext.getContext();
try { try {
print("getCurrentConfiguration - configId: ${tabletAppContext.configuration?.id}");
print("getCurrentConfiguration - host: ${tabletAppContext.host}");
ConfigurationDTO? configurationDTO = await tabletAppContext.clientAPI!.configurationApi!.configurationGetDetail(tabletAppContext.configuration!.id!); // tabletAppContext.configuration!.id! // 65c5f0ee4c030e63ce16bff5 TODO Remove ConfigurationDTO? configurationDTO = await tabletAppContext.clientAPI!.configurationApi!.configurationGetDetail(tabletAppContext.configuration!.id!); // tabletAppContext.configuration!.id! // 65c5f0ee4c030e63ce16bff5 TODO Remove
tabletAppContext.configuration = configurationDTO; tabletAppContext.configuration = configurationDTO;
@ -242,6 +244,7 @@ class _MainViewWidget extends State<MainViewWidget> {
return configurationDTO; return configurationDTO;
} catch (e) { } catch (e) {
print("getCurrentConfiguration - ERROR: $e");
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
const SnackBar( const SnackBar(
content: Text('Une erreur est survenue lors de la récupération de la configuration'), content: Text('Une erreur est survenue lors de la récupération de la configuration'),
@ -281,6 +284,8 @@ class _MainViewWidget extends State<MainViewWidget> {
if(isInit) { if(isInit) {
try { try {
print("getSections - configId: ${tabletAppContext.configuration?.id}");
print("getSections - host: ${tabletAppContext.host}");
final rawList = await tabletAppContext.clientAPI!.sectionApi!.sectionGetFromConfigurationDetail(tabletAppContext.configuration!.id!); final rawList = await tabletAppContext.clientAPI!.sectionApi!.sectionGetFromConfigurationDetail(tabletAppContext.configuration!.id!);
rawSectionsData = jsonDecode(jsonEncode(rawList)); rawSectionsData = jsonDecode(jsonEncode(rawList));
List<SectionDTO> sectionList = jsonDecode(jsonEncode(rawSectionsData)).map((json) => SectionDTO.fromJson(json)).whereType<SectionDTO>().toList(); List<SectionDTO> sectionList = jsonDecode(jsonEncode(rawSectionsData)).map((json) => SectionDTO.fromJson(json)).whereType<SectionDTO>().toList();
@ -288,7 +293,7 @@ class _MainViewWidget extends State<MainViewWidget> {
isInit = false; isInit = false;
return sectionList; return sectionList;
} catch (e) { } catch (e) {
print(e); print("getSections - ERROR: $e");
print("IN CATCH"); print("IN CATCH");
Navigator.pushAndRemoveUntil( Navigator.pushAndRemoveUntil(
context, context,

View File

@ -1,4 +1,4 @@
// Openapi Generator last run: : 2025-05-23T15:19:19.419517 // Openapi Generator last run: : 2026-04-16T14:08:45.302446
import 'package:openapi_generator_annotations/openapi_generator_annotations.dart'; import 'package:openapi_generator_annotations/openapi_generator_annotations.dart';
@Openapi( @Openapi(

File diff suppressed because it is too large Load Diff

View File

@ -14,10 +14,11 @@ import just_audio
import package_info_plus import package_info_plus
import path_provider_foundation import path_provider_foundation
import shared_preferences_foundation import shared_preferences_foundation
import sqflite import sqflite_darwin
import url_launcher_macos import url_launcher_macos
import video_player_avfoundation import video_player_avfoundation
import wakelock_plus import wakelock_plus
import webview_flutter_wkwebview
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin")) AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
@ -33,4 +34,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin")) FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin")) WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
} }

View File

@ -0,0 +1,12 @@
// This is a generated file; do not edit or check into version control.
FLUTTER_ROOT=C:\PROJ\flutter
FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\GITEA\tablet-app
COCOAPODS_PARALLEL_CODE_SIGN=true
FLUTTER_BUILD_DIR=build
FLUTTER_BUILD_NAME=2.1.5
FLUTTER_BUILD_NUMBER=26
FLUTTER_CLI_BUILD_MODE=debug
DART_OBFUSCATION=false
TRACK_WIDGET_CREATION=true
TREE_SHAKE_ICONS=false
PACKAGE_CONFIG=.dart_tool/package_config.json

View File

@ -0,0 +1,13 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=C:\PROJ\flutter"
export "FLUTTER_APPLICATION_PATH=C:\Users\ThomasFransolet\Documents\Documents\Perso\GITEA\tablet-app"
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
export "FLUTTER_BUILD_DIR=build"
export "FLUTTER_BUILD_NAME=2.1.5"
export "FLUTTER_BUILD_NUMBER=26"
export "FLUTTER_CLI_BUILD_MODE=debug"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=true"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.dart_tool/package_config.json"

View File

@ -34,7 +34,7 @@ dependencies:
google_maps_flutter_web: ^0.5.4+3 # 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 youtube_player_iframe: ^5.1.2 # Handle mobile and web here => TO TEST
mapbox_maps_flutter: ^2.0.0 # specific mobile .. mapbox_maps_flutter: ^2.5.0 # specific mobile ..
flutter_map: ^7.0.2 #all flutter_map: ^7.0.2 #all

View File

@ -8,6 +8,7 @@
#include <firebase_core/firebase_core_plugin_c_api.h> #include <firebase_core/firebase_core_plugin_c_api.h>
#include <firebase_storage/firebase_storage_plugin_c_api.h> #include <firebase_storage/firebase_storage_plugin_c_api.h>
#include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
#include <permission_handler_windows/permission_handler_windows_plugin.h> #include <permission_handler_windows/permission_handler_windows_plugin.h>
#include <url_launcher_windows/url_launcher_windows.h> #include <url_launcher_windows/url_launcher_windows.h>
@ -16,6 +17,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
FirebaseStoragePluginCApiRegisterWithRegistrar( FirebaseStoragePluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FirebaseStoragePluginCApi")); registry->GetRegistrarForPlugin("FirebaseStoragePluginCApi"));
FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi"));
PermissionHandlerWindowsPluginRegisterWithRegistrar( PermissionHandlerWindowsPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
UrlLauncherWindowsRegisterWithRegistrar( UrlLauncherWindowsRegisterWithRegistrar(

View File

@ -5,6 +5,7 @@
list(APPEND FLUTTER_PLUGIN_LIST list(APPEND FLUTTER_PLUGIN_LIST
firebase_core firebase_core
firebase_storage firebase_storage
flutter_inappwebview_windows
permission_handler_windows permission_handler_windows
url_launcher_windows url_launcher_windows
) )