From 61de0ffc4c5069f34e95b3a80b462bec230ba15e Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Fri, 14 Feb 2025 21:43:43 +0100 Subject: [PATCH] flutter sdk version, removed android ndk version --- android/app/build.gradle | 2 -- android/gradle.properties | 13 +------------ lib/services/app_service.dart | 2 +- plugins/aves_magnifier/pubspec.yaml | 2 +- plugins/aves_map/pubspec.yaml | 2 +- plugins/aves_model/pubspec.yaml | 2 +- plugins/aves_platform_meta/pubspec.yaml | 2 +- plugins/aves_report/pubspec.yaml | 2 +- plugins/aves_report_console/pubspec.yaml | 2 +- plugins/aves_report_crashlytics/pubspec.yaml | 2 +- plugins/aves_screen_state/pubspec.yaml | 2 +- plugins/aves_services/pubspec.yaml | 2 +- plugins/aves_services_google/pubspec.yaml | 2 +- plugins/aves_services_none/pubspec.yaml | 2 +- plugins/aves_ui/pubspec.yaml | 2 +- plugins/aves_utils/pubspec.yaml | 2 +- plugins/aves_video/pubspec.yaml | 2 +- plugins/aves_video_mpv/pubspec.yaml | 2 +- pubspec.yaml | 2 +- 19 files changed, 18 insertions(+), 31 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 14cb0c62e..ee51d6026 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -35,8 +35,6 @@ kotlin { android { namespace 'deckers.thibault.aves' compileSdk 35 - // cf https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp - ndkVersion '28.0.12916984' defaultConfig { applicationId packageName diff --git a/android/gradle.properties b/android/gradle.properties index 68b10e0d2..b0e38d4be 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,21 +1,10 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -android.nonTransitiveRClass=false -android.nonFinalResIds=false - # full mode is too aggressive and removes essential code # of `metadata-extractor` even when adding `-keep class com.drew.**{ *; }` android.enableR8.fullMode=false diff --git a/lib/services/app_service.dart b/lib/services/app_service.dart index 9bfb04dc2..7c1cb949e 100644 --- a/lib/services/app_service.dart +++ b/lib/services/app_service.dart @@ -81,7 +81,7 @@ class PlatformAppService implements AppService { 'sizeDip': size, }); if (result != null) return result as Uint8List; - } on PlatformException catch (_, __) { + } on PlatformException catch (_) { // ignore, as some packages legitimately do not have icons } return Uint8List(0); diff --git a/plugins/aves_magnifier/pubspec.yaml b/plugins/aves_magnifier/pubspec.yaml index 6c2f3c744..d7f5034b1 100644 --- a/plugins/aves_magnifier/pubspec.yaml +++ b/plugins/aves_magnifier/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_map/pubspec.yaml b/plugins/aves_map/pubspec.yaml index 355bd84e6..c2f94e8d3 100644 --- a/plugins/aves_map/pubspec.yaml +++ b/plugins/aves_map/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_model/pubspec.yaml b/plugins/aves_model/pubspec.yaml index 90c1ac696..2036a9d8a 100644 --- a/plugins/aves_model/pubspec.yaml +++ b/plugins/aves_model/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_platform_meta/pubspec.yaml b/plugins/aves_platform_meta/pubspec.yaml index f53ffb25b..4d7c793f8 100644 --- a/plugins/aves_platform_meta/pubspec.yaml +++ b/plugins/aves_platform_meta/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_report/pubspec.yaml b/plugins/aves_report/pubspec.yaml index 48cb54cde..eb67268a5 100644 --- a/plugins/aves_report/pubspec.yaml +++ b/plugins/aves_report/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_report_console/pubspec.yaml b/plugins/aves_report_console/pubspec.yaml index 303cdf606..27c9efd26 100644 --- a/plugins/aves_report_console/pubspec.yaml +++ b/plugins/aves_report_console/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_report_crashlytics/pubspec.yaml b/plugins/aves_report_crashlytics/pubspec.yaml index 06932ea46..dafbc0159 100644 --- a/plugins/aves_report_crashlytics/pubspec.yaml +++ b/plugins/aves_report_crashlytics/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_screen_state/pubspec.yaml b/plugins/aves_screen_state/pubspec.yaml index 4a64ecd04..c55dda1cd 100644 --- a/plugins/aves_screen_state/pubspec.yaml +++ b/plugins/aves_screen_state/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_services/pubspec.yaml b/plugins/aves_services/pubspec.yaml index 94b98f8f8..2684ea5bb 100644 --- a/plugins/aves_services/pubspec.yaml +++ b/plugins/aves_services/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_services_google/pubspec.yaml b/plugins/aves_services_google/pubspec.yaml index 48e184bde..b90e34f35 100644 --- a/plugins/aves_services_google/pubspec.yaml +++ b/plugins/aves_services_google/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_services_none/pubspec.yaml b/plugins/aves_services_none/pubspec.yaml index 6aec2f268..c6d78be81 100644 --- a/plugins/aves_services_none/pubspec.yaml +++ b/plugins/aves_services_none/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_ui/pubspec.yaml b/plugins/aves_ui/pubspec.yaml index ca7f9c9f7..876aebe7e 100644 --- a/plugins/aves_ui/pubspec.yaml +++ b/plugins/aves_ui/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_utils/pubspec.yaml b/plugins/aves_utils/pubspec.yaml index e7874aeda..f6e59e356 100644 --- a/plugins/aves_utils/pubspec.yaml +++ b/plugins/aves_utils/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_video/pubspec.yaml b/plugins/aves_video/pubspec.yaml index 79e3ffb50..ef4b90ce6 100644 --- a/plugins/aves_video/pubspec.yaml +++ b/plugins/aves_video/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/plugins/aves_video_mpv/pubspec.yaml b/plugins/aves_video_mpv/pubspec.yaml index 6139640fc..0c8acab55 100644 --- a/plugins/aves_video_mpv/pubspec.yaml +++ b/plugins/aves_video_mpv/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ^3.6.0 + sdk: ^3.7.0 resolution: workspace dependencies: diff --git a/pubspec.yaml b/pubspec.yaml index b85b0e196..2136c82a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ environment: # this project bundles Flutter SDK via `flutter_wrapper` # cf https://github.com/passsy/flutter_wrapper flutter: 3.29.0 - sdk: ^3.6.0 + sdk: ^3.7.0 workspace: - plugins/aves_magnifier - plugins/aves_map