From b1969aff16a0eb85f256cbbd579f051bf4c86916 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Tue, 15 Nov 2022 21:09:24 +0100 Subject: [PATCH] #29 libre flavour --- .github/workflows/release.yml | 3 + android/app/build.gradle | 22 +++- .../app/src/debug/res/xml/screen_saver.xml | 2 - android/app/src/libre/res/values/strings.xml | 4 + .../app/src/libreDebug/res/values/strings.xml | 4 + .../src/libreProfile/res/values/strings.xml | 4 + android/app/src/main/res/xml/screen_saver.xml | 2 +- .../app/src/profile/res/xml/screen_saver.xml | 2 - android/build.gradle | 2 +- lib/app_flavor.dart | 3 +- lib/main_libre.dart | 11 ++ lib/utils/constants.dart | 3 + lib/widgets/about/bug_report.dart | 10 +- .../aves_magnifier/.gitignore | 0 .../aves_magnifier/.metadata | 0 .../aves_magnifier/analysis_options.yaml | 0 .../aves_magnifier/lib/aves_magnifier.dart | 0 .../lib/src/controller/controller.dart | 0 .../src/controller/controller_delegate.dart | 0 .../lib/src/controller/state.dart | 0 .../aves_magnifier/lib/src/core/core.dart | 0 .../lib/src/core/gesture_detector.dart | 0 .../src/core/scale_gesture_recognizer.dart | 0 .../aves_magnifier/lib/src/magnifier.dart | 0 .../lib/src/pan/corner_hit_detector.dart | 0 .../lib/src/pan/gesture_detector_scope.dart | 0 .../lib/src/pan/scroll_physics.dart | 0 .../lib/src/scale/scale_boundaries.dart | 0 .../lib/src/scale/scale_level.dart | 0 .../aves_magnifier/lib/src/scale/state.dart | 0 .../aves_magnifier/pubspec.yaml | 0 plugins/aves_services_none/.gitignore | 30 +++++ plugins/aves_services_none/.metadata | 10 ++ .../aves_services_none/analysis_options.yaml | 1 + .../lib/aves_services_platform.dart | 41 ++++++ plugins/aves_services_none/pubspec.yaml | 20 +++ pubspec.lock | 117 +----------------- pubspec.yaml | 6 +- scripts/apply_flavor_huawei.sh | 4 +- scripts/apply_flavor_izzy.sh | 4 +- scripts/apply_flavor_libre.sh | 13 ++ scripts/apply_flavor_play.sh | 4 +- scripts/pub_get_all.sh | 8 -- scripts/pub_upgrade_all.sh | 8 -- 44 files changed, 187 insertions(+), 151 deletions(-) delete mode 100644 android/app/src/debug/res/xml/screen_saver.xml create mode 100644 android/app/src/libre/res/values/strings.xml create mode 100644 android/app/src/libreDebug/res/values/strings.xml create mode 100644 android/app/src/libreProfile/res/values/strings.xml delete mode 100644 android/app/src/profile/res/xml/screen_saver.xml create mode 100644 lib/main_libre.dart rename {packages => plugins}/aves_magnifier/.gitignore (100%) rename {packages => plugins}/aves_magnifier/.metadata (100%) rename {packages => plugins}/aves_magnifier/analysis_options.yaml (100%) rename {packages => plugins}/aves_magnifier/lib/aves_magnifier.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/controller/controller.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/controller/controller_delegate.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/controller/state.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/core/core.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/core/gesture_detector.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/core/scale_gesture_recognizer.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/magnifier.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/pan/corner_hit_detector.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/pan/gesture_detector_scope.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/pan/scroll_physics.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/scale/scale_boundaries.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/scale/scale_level.dart (100%) rename {packages => plugins}/aves_magnifier/lib/src/scale/state.dart (100%) rename {packages => plugins}/aves_magnifier/pubspec.yaml (100%) create mode 100644 plugins/aves_services_none/.gitignore create mode 100644 plugins/aves_services_none/.metadata create mode 100644 plugins/aves_services_none/analysis_options.yaml create mode 100644 plugins/aves_services_none/lib/aves_services_platform.dart create mode 100644 plugins/aves_services_none/pubspec.yaml create mode 100755 scripts/apply_flavor_libre.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 116f899bf..4f4efb233 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,6 +66,9 @@ jobs: (cd scripts/; ./apply_flavor_izzy.sh) flutter build apk -t lib/main_izzy.dart --flavor izzy --split-per-abi --bundle-sksl-path shaders_3.3.8.sksl.json cp build/app/outputs/apk/izzy/release/*.apk outputs + (cd scripts/; ./apply_flavor_libre.sh) + flutter build apk -t lib/main_libre.dart --flavor libre --bundle-sksl-path shaders_3.3.8.sksl.json + cp build/app/outputs/apk/libre/release/*.apk outputs rm $AVES_STORE_FILE env: AVES_STORE_FILE: ${{ github.workspace }}/key.jks diff --git a/android/app/build.gradle b/android/app/build.gradle index 3818aed2a..3cd182967 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -4,7 +4,7 @@ plugins { id 'kotlin-kapt' } -def appId = "deckers.thibault.aves" +def packageName = "deckers.thibault.aves" // Flutter properties @@ -49,7 +49,7 @@ android { } defaultConfig { - applicationId appId + applicationId packageName // minSdkVersion constraints: // - Flutter & other plugins: 16 // - google_maps_flutter v2.1.1: 20 @@ -63,7 +63,6 @@ android { manifestPlaceholders = [googleApiKey: keystoreProperties['googleApiKey'], huaweiApiKey: keystoreProperties['huaweiApiKey']] multiDexEnabled true - resValue 'string', 'search_provider', "${appId}.search_provider" } signingConfigs { @@ -106,16 +105,24 @@ android { // generate APK by ABI, but NDK ABI filters are incompatible with split APK generation ext.useNdkAbiFilters = false } + + libre { + // F-Droid + applicationIdSuffix ".libre" + dimension "store" + ext.useCrashlytics = false + ext.useHMS = false + // generate a universal APK without x86 native libs + ext.useNdkAbiFilters = true + } } buildTypes { debug { applicationIdSuffix ".debug" - resValue 'string', 'search_provider', "${appId}.debug.search_provider" } profile { applicationIdSuffix ".profile" - resValue 'string', 'search_provider', "${appId}.profile.search_provider" } release { signingConfig signingConfigs.release @@ -124,6 +131,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + applicationVariants.all { variant -> + variant.resValue 'string', 'screen_saver_settings_activity', "${applicationId}/${packageName}.ScreenSaverSettingsActivity" + variant.resValue 'string', 'search_provider', "${applicationId}.search_provider" + } + android.productFlavors.each { flavor -> def tasks = gradle.startParameter.taskNames.toString().toLowerCase() if (tasks.contains(flavor.name) && flavor.ext.useNdkAbiFilters) { diff --git a/android/app/src/debug/res/xml/screen_saver.xml b/android/app/src/debug/res/xml/screen_saver.xml deleted file mode 100644 index 7b51a7bea..000000000 --- a/android/app/src/debug/res/xml/screen_saver.xml +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/android/app/src/libre/res/values/strings.xml b/android/app/src/libre/res/values/strings.xml new file mode 100644 index 000000000..b451c0825 --- /dev/null +++ b/android/app/src/libre/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Aves Libre + \ No newline at end of file diff --git a/android/app/src/libreDebug/res/values/strings.xml b/android/app/src/libreDebug/res/values/strings.xml new file mode 100644 index 000000000..4c8451714 --- /dev/null +++ b/android/app/src/libreDebug/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Aves Libre [Debug] + \ No newline at end of file diff --git a/android/app/src/libreProfile/res/values/strings.xml b/android/app/src/libreProfile/res/values/strings.xml new file mode 100644 index 000000000..2918b24c8 --- /dev/null +++ b/android/app/src/libreProfile/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Aves Libre [Profile] + \ No newline at end of file diff --git a/android/app/src/main/res/xml/screen_saver.xml b/android/app/src/main/res/xml/screen_saver.xml index 78dbc6777..d1de689a1 100644 --- a/android/app/src/main/res/xml/screen_saver.xml +++ b/android/app/src/main/res/xml/screen_saver.xml @@ -1,2 +1,2 @@ \ No newline at end of file + android:settingsActivity="@string/screen_saver_settings_activity" /> \ No newline at end of file diff --git a/android/app/src/profile/res/xml/screen_saver.xml b/android/app/src/profile/res/xml/screen_saver.xml deleted file mode 100644 index 012d5b878..000000000 --- a/android/app/src/profile/res/xml/screen_saver.xml +++ /dev/null @@ -1,2 +0,0 @@ - \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 4e4351257..ccac79951 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.7.20' repositories { google() mavenCentral() diff --git a/lib/app_flavor.dart b/lib/app_flavor.dart index 6cd5520ae..69d2e74c7 100644 --- a/lib/app_flavor.dart +++ b/lib/app_flavor.dart @@ -1,4 +1,4 @@ -enum AppFlavor { play, huawei, izzy } +enum AppFlavor { play, huawei, izzy, libre } extension ExtraAppFlavor on AppFlavor { bool get canEnableErrorReporting { @@ -7,6 +7,7 @@ extension ExtraAppFlavor on AppFlavor { return true; case AppFlavor.huawei: case AppFlavor.izzy: + case AppFlavor.libre: return false; } } diff --git a/lib/main_libre.dart b/lib/main_libre.dart new file mode 100644 index 000000000..bab8e0099 --- /dev/null +++ b/lib/main_libre.dart @@ -0,0 +1,11 @@ +import 'package:aves/app_flavor.dart'; +import 'package:aves/main_common.dart'; +import 'package:aves/widget_common.dart'; + +const _flavor = AppFlavor.libre; + +@pragma('vm:entry-point') +void main() => mainCommon(_flavor); + +@pragma('vm:entry-point') +void widgetMain() => widgetMainCommon(_flavor); diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart index de4ca5cfc..8e662de47 100644 --- a/lib/utils/constants.dart +++ b/lib/utils/constants.dart @@ -223,6 +223,8 @@ class Constants { ..._googleMobileServices, ]; + static const List _flutterPluginsLibreOnly = []; + static const List _flutterPluginsPlayOnly = [ ..._googleMobileServices, Dependency( @@ -236,6 +238,7 @@ class Constants { ..._flutterPluginsCommon, if (flavor == AppFlavor.huawei) ..._flutterPluginsHuaweiOnly, if (flavor == AppFlavor.izzy) ..._flutterPluginsIzzyOnly, + if (flavor == AppFlavor.libre) ..._flutterPluginsLibreOnly, if (flavor == AppFlavor.play) ..._flutterPluginsPlayOnly, ]; diff --git a/lib/widgets/about/bug_report.dart b/lib/widgets/about/bug_report.dart index 8903e6a1e..fcb11f6b5 100644 --- a/lib/widgets/about/bug_report.dart +++ b/lib/widgets/about/bug_report.dart @@ -145,9 +145,13 @@ class _BugReportState extends State with FeedbackMixin { final androidInfo = await DeviceInfoPlugin().androidInfo; final flavor = context.read().toString().split('.')[1]; return [ - 'Aves version: ${packageInfo.version}-$flavor (Build ${packageInfo.buildNumber})', - 'Flutter version: ${version['frameworkVersion']} (Channel ${version['channel']})', - 'Android version: ${androidInfo.version.release} (SDK ${androidInfo.version.sdkInt})', + 'Package: ${packageInfo.packageName}', + 'Aves version: ${packageInfo.version}-$flavor', + 'Aves build: ${packageInfo.buildNumber}', + 'Flutter version: ${version['frameworkVersion']}', + 'Flutter channel: ${version['channel']}', + 'Android version: ${androidInfo.version.release}', + 'Android API: ${androidInfo.version.sdkInt}', 'Android build: ${androidInfo.display}', 'Device: ${androidInfo.manufacturer} ${androidInfo.model}', 'Geocoder: ${device.hasGeocoder ? 'ready' : 'not available'}', diff --git a/packages/aves_magnifier/.gitignore b/plugins/aves_magnifier/.gitignore similarity index 100% rename from packages/aves_magnifier/.gitignore rename to plugins/aves_magnifier/.gitignore diff --git a/packages/aves_magnifier/.metadata b/plugins/aves_magnifier/.metadata similarity index 100% rename from packages/aves_magnifier/.metadata rename to plugins/aves_magnifier/.metadata diff --git a/packages/aves_magnifier/analysis_options.yaml b/plugins/aves_magnifier/analysis_options.yaml similarity index 100% rename from packages/aves_magnifier/analysis_options.yaml rename to plugins/aves_magnifier/analysis_options.yaml diff --git a/packages/aves_magnifier/lib/aves_magnifier.dart b/plugins/aves_magnifier/lib/aves_magnifier.dart similarity index 100% rename from packages/aves_magnifier/lib/aves_magnifier.dart rename to plugins/aves_magnifier/lib/aves_magnifier.dart diff --git a/packages/aves_magnifier/lib/src/controller/controller.dart b/plugins/aves_magnifier/lib/src/controller/controller.dart similarity index 100% rename from packages/aves_magnifier/lib/src/controller/controller.dart rename to plugins/aves_magnifier/lib/src/controller/controller.dart diff --git a/packages/aves_magnifier/lib/src/controller/controller_delegate.dart b/plugins/aves_magnifier/lib/src/controller/controller_delegate.dart similarity index 100% rename from packages/aves_magnifier/lib/src/controller/controller_delegate.dart rename to plugins/aves_magnifier/lib/src/controller/controller_delegate.dart diff --git a/packages/aves_magnifier/lib/src/controller/state.dart b/plugins/aves_magnifier/lib/src/controller/state.dart similarity index 100% rename from packages/aves_magnifier/lib/src/controller/state.dart rename to plugins/aves_magnifier/lib/src/controller/state.dart diff --git a/packages/aves_magnifier/lib/src/core/core.dart b/plugins/aves_magnifier/lib/src/core/core.dart similarity index 100% rename from packages/aves_magnifier/lib/src/core/core.dart rename to plugins/aves_magnifier/lib/src/core/core.dart diff --git a/packages/aves_magnifier/lib/src/core/gesture_detector.dart b/plugins/aves_magnifier/lib/src/core/gesture_detector.dart similarity index 100% rename from packages/aves_magnifier/lib/src/core/gesture_detector.dart rename to plugins/aves_magnifier/lib/src/core/gesture_detector.dart diff --git a/packages/aves_magnifier/lib/src/core/scale_gesture_recognizer.dart b/plugins/aves_magnifier/lib/src/core/scale_gesture_recognizer.dart similarity index 100% rename from packages/aves_magnifier/lib/src/core/scale_gesture_recognizer.dart rename to plugins/aves_magnifier/lib/src/core/scale_gesture_recognizer.dart diff --git a/packages/aves_magnifier/lib/src/magnifier.dart b/plugins/aves_magnifier/lib/src/magnifier.dart similarity index 100% rename from packages/aves_magnifier/lib/src/magnifier.dart rename to plugins/aves_magnifier/lib/src/magnifier.dart diff --git a/packages/aves_magnifier/lib/src/pan/corner_hit_detector.dart b/plugins/aves_magnifier/lib/src/pan/corner_hit_detector.dart similarity index 100% rename from packages/aves_magnifier/lib/src/pan/corner_hit_detector.dart rename to plugins/aves_magnifier/lib/src/pan/corner_hit_detector.dart diff --git a/packages/aves_magnifier/lib/src/pan/gesture_detector_scope.dart b/plugins/aves_magnifier/lib/src/pan/gesture_detector_scope.dart similarity index 100% rename from packages/aves_magnifier/lib/src/pan/gesture_detector_scope.dart rename to plugins/aves_magnifier/lib/src/pan/gesture_detector_scope.dart diff --git a/packages/aves_magnifier/lib/src/pan/scroll_physics.dart b/plugins/aves_magnifier/lib/src/pan/scroll_physics.dart similarity index 100% rename from packages/aves_magnifier/lib/src/pan/scroll_physics.dart rename to plugins/aves_magnifier/lib/src/pan/scroll_physics.dart diff --git a/packages/aves_magnifier/lib/src/scale/scale_boundaries.dart b/plugins/aves_magnifier/lib/src/scale/scale_boundaries.dart similarity index 100% rename from packages/aves_magnifier/lib/src/scale/scale_boundaries.dart rename to plugins/aves_magnifier/lib/src/scale/scale_boundaries.dart diff --git a/packages/aves_magnifier/lib/src/scale/scale_level.dart b/plugins/aves_magnifier/lib/src/scale/scale_level.dart similarity index 100% rename from packages/aves_magnifier/lib/src/scale/scale_level.dart rename to plugins/aves_magnifier/lib/src/scale/scale_level.dart diff --git a/packages/aves_magnifier/lib/src/scale/state.dart b/plugins/aves_magnifier/lib/src/scale/state.dart similarity index 100% rename from packages/aves_magnifier/lib/src/scale/state.dart rename to plugins/aves_magnifier/lib/src/scale/state.dart diff --git a/packages/aves_magnifier/pubspec.yaml b/plugins/aves_magnifier/pubspec.yaml similarity index 100% rename from packages/aves_magnifier/pubspec.yaml rename to plugins/aves_magnifier/pubspec.yaml diff --git a/plugins/aves_services_none/.gitignore b/plugins/aves_services_none/.gitignore new file mode 100644 index 000000000..96486fd93 --- /dev/null +++ b/plugins/aves_services_none/.gitignore @@ -0,0 +1,30 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.packages +build/ diff --git a/plugins/aves_services_none/.metadata b/plugins/aves_services_none/.metadata new file mode 100644 index 000000000..a83125432 --- /dev/null +++ b/plugins/aves_services_none/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: 52b3dc25f6471c27b2144594abb11c741cb88f57 + channel: stable + +project_type: package diff --git a/plugins/aves_services_none/analysis_options.yaml b/plugins/aves_services_none/analysis_options.yaml new file mode 100644 index 000000000..f04c6cf0f --- /dev/null +++ b/plugins/aves_services_none/analysis_options.yaml @@ -0,0 +1 @@ +include: ../../analysis_options.yaml diff --git a/plugins/aves_services_none/lib/aves_services_platform.dart b/plugins/aves_services_none/lib/aves_services_platform.dart new file mode 100644 index 000000000..4d326fc1c --- /dev/null +++ b/plugins/aves_services_none/lib/aves_services_platform.dart @@ -0,0 +1,41 @@ +library aves_services_platform; + +import 'package:aves_map/aves_map.dart'; +import 'package:aves_services/aves_services.dart'; +import 'package:flutter/widgets.dart'; +import 'package:latlong2/latlong.dart'; + +class PlatformMobileServices extends MobileServices { + @override + Future init() async {} + + @override + bool get isServiceAvailable => false; + + @override + EntryMapStyle get defaultMapStyle => EntryMapStyle.values.first; + + @override + List get mapStyles => []; + + @override + Widget buildMap({ + required AvesMapController? controller, + required Listenable clusterListenable, + required ValueNotifier boundsNotifier, + required EntryMapStyle style, + required TransitionBuilder decoratorBuilder, + required ButtonPanelBuilder buttonPanelBuilder, + required MarkerClusterBuilder markerClusterBuilder, + required MarkerWidgetBuilder markerWidgetBuilder, + required MarkerImageReadyChecker markerImageReadyChecker, + required ValueNotifier? dotLocationNotifier, + required ValueNotifier? overlayOpacityNotifier, + required MapOverlay? overlayEntry, + required UserZoomChangeCallback? onUserZoomChange, + required MapTapCallback? onMapTap, + required MarkerTapCallback? onMarkerTap, + }) { + return const SizedBox(); + } +} diff --git a/plugins/aves_services_none/pubspec.yaml b/plugins/aves_services_none/pubspec.yaml new file mode 100644 index 000000000..9869ff9a3 --- /dev/null +++ b/plugins/aves_services_none/pubspec.yaml @@ -0,0 +1,20 @@ +name: aves_services_platform +version: 0.0.1 +publish_to: none + +environment: + sdk: ">=2.18.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + aves_map: + path: ../aves_map + aves_services: + path: ../aves_services + latlong2: + +dev_dependencies: + flutter_lints: + +flutter: diff --git a/pubspec.lock b/pubspec.lock index 2dea2a9eb..96f1e0e8b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -8,13 +8,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "47.0.0" - _flutterfire_internals: - dependency: transitive - description: - name: _flutterfire_internals - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.8" analyzer: dependency: transitive description: @@ -46,7 +39,7 @@ packages: aves_magnifier: dependency: "direct main" description: - path: "packages/aves_magnifier" + path: "plugins/aves_magnifier" relative: true source: path version: "0.0.1" @@ -67,7 +60,7 @@ packages: aves_report_platform: dependency: "direct main" description: - path: "plugins/aves_report_crashlytics" + path: "plugins/aves_report_console" relative: true source: path version: "0.0.1" @@ -81,7 +74,7 @@ packages: aves_services_platform: dependency: "direct main" description: - path: "plugins/aves_services_google" + path: "plugins/aves_services_none" relative: true source: path version: "0.0.1" @@ -127,20 +120,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.1" - cloud_firestore_platform_interface: - dependency: transitive - description: - name: cloud_firestore_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "5.8.5" - cloud_firestore_web: - dependency: transitive - description: - name: cloud_firestore_web - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.5" collection: dependency: "direct main" description: @@ -285,41 +264,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "6.1.2" - firebase_core: - dependency: transitive - description: - name: firebase_core - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.0" - firebase_core_platform_interface: - dependency: transitive - description: - name: firebase_core_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "4.5.2" - firebase_core_web: - dependency: transitive - description: - name: firebase_core_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - firebase_crashlytics: - dependency: transitive - description: - name: firebase_crashlytics - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.5" - firebase_crashlytics_platform_interface: - dependency: transitive - description: - name: firebase_crashlytics_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "3.3.6" flex_color_picker: dependency: "direct main" description: @@ -398,13 +342,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.6.13" - flutter_plugin_android_lifecycle: - dependency: transitive - description: - name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.7" flutter_staggered_animations: dependency: "direct main" description: @@ -448,41 +385,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.0" - google_api_availability: - dependency: transitive - description: - name: google_api_availability - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.1" - google_maps_flutter: - dependency: transitive - description: - name: google_maps_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.1" - google_maps_flutter_android: - dependency: transitive - description: - name: google_maps_flutter_android - url: "https://pub.dartlang.org" - source: hosted - version: "2.3.3" - google_maps_flutter_ios: - dependency: transitive - description: - name: google_maps_flutter_ios - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.12" - google_maps_flutter_platform_interface: - dependency: transitive - description: - name: google_maps_flutter_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.4" highlight: dependency: transitive description: @@ -652,7 +554,7 @@ packages: name: overlay_support url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.1.0" package_config: dependency: transitive description: @@ -666,7 +568,7 @@ packages: name: package_info_plus url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" package_info_plus_platform_interface: dependency: transitive description: @@ -850,7 +752,7 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" qr: dependency: transitive description: @@ -1045,13 +947,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.0" - stream_transform: - dependency: transitive - description: - name: stream_transform - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" streams_channel: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 1b366eacd..e185cb13b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -22,17 +22,17 @@ dependencies: flutter_localizations: sdk: flutter aves_magnifier: - path: packages/aves_magnifier + path: plugins/aves_magnifier aves_map: path: plugins/aves_map aves_report: path: plugins/aves_report aves_report_platform: - path: plugins/aves_report_crashlytics + path: plugins/aves_report_console aves_services: path: plugins/aves_services aves_services_platform: - path: plugins/aves_services_google + path: plugins/aves_services_none charts_flutter: collection: connectivity_plus: diff --git a/scripts/apply_flavor_huawei.sh b/scripts/apply_flavor_huawei.sh index 40092a785..666090f87 100755 --- a/scripts/apply_flavor_huawei.sh +++ b/scripts/apply_flavor_huawei.sh @@ -7,7 +7,7 @@ PUBSPEC_PATH="pubspec.yaml" flutter clean -sed -i 's/aves_services_google/aves_services_huawei/g' "$PUBSPEC_PATH" -sed -i 's/aves_report_crashlytics/aves_report_console/g' "$PUBSPEC_PATH" +sed -i 's|plugins/aves_services_.*|plugins/aves_services_huawei|g' "$PUBSPEC_PATH" +sed -i 's|plugins/aves_report_.*|plugins/aves_report_console|g' "$PUBSPEC_PATH" flutter pub get diff --git a/scripts/apply_flavor_izzy.sh b/scripts/apply_flavor_izzy.sh index f1dc35d6f..88ef4ed62 100755 --- a/scripts/apply_flavor_izzy.sh +++ b/scripts/apply_flavor_izzy.sh @@ -7,7 +7,7 @@ PUBSPEC_PATH="pubspec.yaml" flutter clean -sed -i 's/aves_services_huawei/aves_services_google/g' "$PUBSPEC_PATH" -sed -i 's/aves_report_crashlytics/aves_report_console/g' "$PUBSPEC_PATH" +sed -i 's|plugins/aves_services_.*|plugins/aves_services_google|g' "$PUBSPEC_PATH" +sed -i 's|plugins/aves_report_.*|plugins/aves_report_console|g' "$PUBSPEC_PATH" flutter pub get diff --git a/scripts/apply_flavor_libre.sh b/scripts/apply_flavor_libre.sh new file mode 100755 index 000000000..3e9aa6321 --- /dev/null +++ b/scripts/apply_flavor_libre.sh @@ -0,0 +1,13 @@ +#!/bin/bash +if [ ! -d "scripts" ]; then + cd .. +fi + +PUBSPEC_PATH="pubspec.yaml" + +flutter clean + +sed -i 's|plugins/aves_services_.*|plugins/aves_services_none|g' "$PUBSPEC_PATH" +sed -i 's|plugins/aves_report_.*|plugins/aves_report_console|g' "$PUBSPEC_PATH" + +flutter pub get diff --git a/scripts/apply_flavor_play.sh b/scripts/apply_flavor_play.sh index 4fc7620b6..3268d5a6d 100755 --- a/scripts/apply_flavor_play.sh +++ b/scripts/apply_flavor_play.sh @@ -7,7 +7,7 @@ PUBSPEC_PATH="pubspec.yaml" flutter clean -sed -i 's/aves_services_huawei/aves_services_google/g' "$PUBSPEC_PATH" -sed -i 's/aves_report_console/aves_report_crashlytics/g' "$PUBSPEC_PATH" +sed -i 's|plugins/aves_services_.*|plugins/aves_services_google|g' "$PUBSPEC_PATH" +sed -i 's|plugins/aves_report_.*|plugins/aves_report_crashlytics|g' "$PUBSPEC_PATH" flutter pub get diff --git a/scripts/pub_get_all.sh b/scripts/pub_get_all.sh index e3cbb2bb2..47bc01692 100755 --- a/scripts/pub_get_all.sh +++ b/scripts/pub_get_all.sh @@ -5,14 +5,6 @@ fi flutter pub get -cd packages || exit -for package in $(ls -d *); do - cd $package - flutter pub get - cd .. -done -cd .. - cd plugins || exit for plugin in $(ls -d *); do cd $plugin diff --git a/scripts/pub_upgrade_all.sh b/scripts/pub_upgrade_all.sh index 2bce3eede..0710b7262 100755 --- a/scripts/pub_upgrade_all.sh +++ b/scripts/pub_upgrade_all.sh @@ -5,14 +5,6 @@ fi flutter pub upgrade -cd packages || exit -for package in $(ls -d *); do - cd $package - flutter pub upgrade - cd .. -done -cd .. - cd plugins || exit for plugin in $(ls -d *); do cd $plugin