From 6150473b3d172733dc398c8e48113e7d36d57ea9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:07:09 +0000 Subject: [PATCH 1/3] chore(deps): update plugin com.android.application to v8 --- packages/app/android/settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/android/settings.gradle b/packages/app/android/settings.gradle index fd066b7ee3f..b64b2eb734c 100644 --- a/packages/app/android/settings.gradle +++ b/packages/app/android/settings.gradle @@ -23,7 +23,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.4.2" apply false + id "com.android.application" version "8.3.1" apply false } include ":app" From 50d9d27a7ebda90e8ad7e3ba8e65d5622691cd0e Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 20 Mar 2024 20:27:50 +0100 Subject: [PATCH 2/3] fix(neon_files): Switch to open_filex for Gradle 8 support Signed-off-by: provokateurin --- .cspell/dart_flutter.txt | 1 + packages/app/android/app/build.gradle | 2 +- packages/app/pubspec.lock | 8 ++++---- packages/neon/neon_files/lib/src/blocs/files.dart | 4 ++-- packages/neon/neon_files/pubspec.yaml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.cspell/dart_flutter.txt b/.cspell/dart_flutter.txt index a618a83cf00..79a6b8b6cb4 100644 --- a/.cspell/dart_flutter.txt +++ b/.cspell/dart_flutter.txt @@ -4,6 +4,7 @@ cupertino endtemplate exclamationmark expando +filex gapless goldens lerp diff --git a/packages/app/android/app/build.gradle b/packages/app/android/app/build.gradle index 55a69c8c4bb..bd764c542dd 100644 --- a/packages/app/android/app/build.gradle +++ b/packages/app/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "de.provokateurin.neon" compileSdkVersion 34 - ndkVersion flutter.ndkVersion + ndkVersion "25.1.8937393" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index 2aa46f8b90b..5f65f93410d 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -826,14 +826,14 @@ packages: relative: true source: path version: "5.0.2" - open_file: + open_filex: dependency: transitive description: - name: open_file - sha256: a5a32d44acb7c899987d0999e1e3cbb0a0f1adebbf41ac813ec6d2d8faa0af20 + name: open_filex + sha256: "74e2280754cf8161e860746c3181db2c996d6c1909c7057b738ede4a469816b8" url: "https://pub.dev" source: hosted - version: "3.3.2" + version: "4.4.0" package_config: dependency: transitive description: diff --git a/packages/neon/neon_files/lib/src/blocs/files.dart b/packages/neon/neon_files/lib/src/blocs/files.dart index 0914424321f..6bc4ba24736 100644 --- a/packages/neon/neon_files/lib/src/blocs/files.dart +++ b/packages/neon/neon_files/lib/src/blocs/files.dart @@ -13,7 +13,7 @@ import 'package:neon_framework/models.dart'; import 'package:neon_framework/platform.dart'; import 'package:neon_framework/utils.dart'; import 'package:nextcloud/nextcloud.dart'; -import 'package:open_file/open_file.dart'; +import 'package:open_filex/open_filex.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart'; import 'package:queue/queue.dart'; @@ -139,7 +139,7 @@ class _FilesBloc extends InteractiveBloc implements FilesBloc { () async { if (NeonPlatform.instance.canUsePaths) { final file = await cacheFile(uri, etag); - final result = await OpenFile.open(file.path, type: mimeType); + final result = await OpenFilex.open(file.path, type: mimeType); if (result.type != ResultType.done) { throw const UnableToOpenFileException(); } diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/neon/neon_files/pubspec.yaml index ca93f2337d5..7de70d29f84 100644 --- a/packages/neon/neon_files/pubspec.yaml +++ b/packages/neon/neon_files/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: url: https://github.com/nextcloud/neon path: packages/neon_framework nextcloud: ^5.0.2 - open_file: ^3.0.0 + open_filex: ^4.4.0 path: ^1.0.0 path_provider: ^2.0.0 queue: ^3.0.0 From 04f2209b91a3fd15cf8c0e1c109b4b25ff80d522 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Wed, 20 Mar 2024 20:28:41 +0100 Subject: [PATCH 3/3] fix(app): Enable core desugaring for Gradle 8 support Signed-off-by: provokateurin --- packages/app/android/app/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/app/android/app/build.gradle b/packages/app/android/app/build.gradle index bd764c542dd..d4f6959c8ec 100644 --- a/packages/app/android/app/build.gradle +++ b/packages/app/android/app/build.gradle @@ -28,6 +28,7 @@ android { ndkVersion "25.1.8937393" compileOptions { + coreLibraryDesugaringEnabled true sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -48,6 +49,7 @@ android { targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName + multiDexEnabled true } buildTypes { @@ -70,4 +72,5 @@ flutter { dependencies { implementation('com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta5') + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' }