diff --git a/.gitignore b/.gitignore index 695e072ff..96fc9851f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -27,7 +29,6 @@ migrate_working_dir/ .dart_tool/ .flutter-plugins .flutter-plugins-dependencies -.packages .pub-cache/ .pub/ /build/ diff --git a/android/.gitignore b/android/.gitignore index 94fd322d0..be3943c96 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,14 +1,14 @@ gradle-wrapper.jar /.gradle -/app/.cxx/ /captures/ /gradlew /gradlew.bat /local.properties GeneratedPluginRegistrant.java +.cxx/ # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100644 index 6643a6d45..000000000 --- a/android/settings.gradle +++ /dev/null @@ -1,33 +0,0 @@ -pluginManagement { - def flutterSdkPath = { - def properties = new Properties() - file("local.properties").withInputStream { properties.load(it) } - def flutterSdkPath = properties.getProperty("flutter.sdk") - assert flutterSdkPath != null, "flutter.sdk not set in local.properties" - return flutterSdkPath - } - settings.ext.flutterSdkPath = flutterSdkPath() - - settings.ext.kotlin_version = '2.1.10' - settings.ext.ksp_version = "$kotlin_version-1.0.29" - settings.ext.agp_version = '8.8.0' - - includeBuild("${settings.ext.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("$agp_version") apply(false) - id("org.jetbrains.kotlin.android") version("$kotlin_version") apply(false) - id("com.google.devtools.ksp") version("$ksp_version") apply(false) - id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") -} - -include(":app") -include(":exifinterface") diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 000000000..89d573443 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,28 @@ +pluginManagement { + val flutterSdkPath = run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + 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 "8.8.1" apply false + id("org.jetbrains.kotlin.android") version "2.1.10" apply false + id("com.google.devtools.ksp") version "2.1.10-1.0.29" apply false + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + +include(":app") +include(":exifinterface") diff --git a/plugins/aves_magnifier/.gitignore b/plugins/aves_magnifier/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_magnifier/.gitignore +++ b/plugins/aves_magnifier/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_map/.gitignore b/plugins/aves_map/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_map/.gitignore +++ b/plugins/aves_map/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_model/.gitignore b/plugins/aves_model/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_model/.gitignore +++ b/plugins/aves_model/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_platform_meta/.gitignore b/plugins/aves_platform_meta/.gitignore index 96486fd93..79c113f9b 100644 --- a/plugins/aves_platform_meta/.gitignore +++ b/plugins/aves_platform_meta/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_platform_meta/android/.gitignore b/plugins/aves_platform_meta/android/.gitignore index 6f568019d..be3943c96 100644 --- a/plugins/aves_platform_meta/android/.gitignore +++ b/plugins/aves_platform_meta/android/.gitignore @@ -5,9 +5,10 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +.cxx/ # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/plugins/aves_report/.gitignore b/plugins/aves_report/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_report/.gitignore +++ b/plugins/aves_report/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_report_console/.gitignore b/plugins/aves_report_console/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_report_console/.gitignore +++ b/plugins/aves_report_console/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_report_crashlytics/.gitignore b/plugins/aves_report_crashlytics/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_report_crashlytics/.gitignore +++ b/plugins/aves_report_crashlytics/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_screen_state/.gitignore b/plugins/aves_screen_state/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_screen_state/.gitignore +++ b/plugins/aves_screen_state/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_screen_state/android/.gitignore b/plugins/aves_screen_state/android/.gitignore index 6f568019d..be3943c96 100644 --- a/plugins/aves_screen_state/android/.gitignore +++ b/plugins/aves_screen_state/android/.gitignore @@ -5,9 +5,10 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +.cxx/ # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/plugins/aves_services/.gitignore b/plugins/aves_services/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_services/.gitignore +++ b/plugins/aves_services/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_services_google/.gitignore b/plugins/aves_services_google/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_services_google/.gitignore +++ b/plugins/aves_services_google/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_services_google/pubspec.yaml b/plugins/aves_services_google/pubspec.yaml index 5286aca30..48e184bde 100644 --- a/plugins/aves_services_google/pubspec.yaml +++ b/plugins/aves_services_google/pubspec.yaml @@ -17,12 +17,11 @@ dependencies: path: ../aves_utils device_info_plus: google_api_availability: - google_api_availability_android: git: # https://github.com/baseflow/flutter-google-api-availability.git main commit af48328 (Jul 17, 2023) is incompatible with Flutter v3.29 url: https://github.com/deckerst/flutter-google-api-availability.git ref: aves - path: google_api_availability_android + path: google_api_availability google_maps_flutter: google_maps_flutter_android: google_maps_flutter_platform_interface: diff --git a/plugins/aves_services_none/.gitignore b/plugins/aves_services_none/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_services_none/.gitignore +++ b/plugins/aves_services_none/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_ui/.gitignore b/plugins/aves_ui/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_ui/.gitignore +++ b/plugins/aves_ui/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_utils/.gitignore b/plugins/aves_utils/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_utils/.gitignore +++ b/plugins/aves_utils/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_video/.gitignore b/plugins/aves_video/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_video/.gitignore +++ b/plugins/aves_video/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/plugins/aves_video_mpv/.gitignore b/plugins/aves_video_mpv/.gitignore index 28124a571..79c113f9b 100644 --- a/plugins/aves_video_mpv/.gitignore +++ b/plugins/aves_video_mpv/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related @@ -22,9 +24,22 @@ migrate_working_dir/ #.vscode/ # Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -#/pubspec.lock **/doc/api/ +**/ios/Flutter/.last_build_id .dart_tool/ -.packages -build/ +.flutter-plugins +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/pubspec.lock b/pubspec.lock index b40b464f6..e81f8fb3d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -503,17 +503,18 @@ packages: google_api_availability: dependency: transitive description: - name: google_api_availability - sha256: "1642876fa87515fd5e4074458f22d6ba4518919c5abce16baaa2878c3c555678" - url: "https://pub.dev" - source: hosted - version: "4.0.0" + path: google_api_availability + ref: aves + resolved-ref: "8cfa6d58fca333fe0c8b7d91983f70154a6ca196" + url: "https://github.com/deckerst/flutter-google-api-availability.git" + source: git + version: "5.0.0" google_api_availability_android: dependency: transitive description: path: google_api_availability_android ref: aves - resolved-ref: bfa9ae35e45524b14594ed0ea28f7e46b7c73edd + resolved-ref: "8cfa6d58fca333fe0c8b7d91983f70154a6ca196" url: "https://github.com/deckerst/flutter-google-api-availability.git" source: git version: "1.0.1"