diff --git a/android/app/build.gradle b/android/app/build.gradle index 575f5c986..95b53c724 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -36,12 +36,12 @@ if (keystorePropertiesFile.exists()) { // for release using credentials in environment variables set up by GitHub Actions // warning: in property file, single quotes should be escaped with a backslash // but they should not be escaped when stored in env variables - keystoreProperties['storeFile'] = System.getenv('AVES_STORE_FILE') ?: '' - keystoreProperties['storePassword'] = System.getenv('AVES_STORE_PASSWORD') ?: '' - keystoreProperties['keyAlias'] = System.getenv('AVES_KEY_ALIAS') ?: '' - keystoreProperties['keyPassword'] = System.getenv('AVES_KEY_PASSWORD') ?: '' - keystoreProperties['googleApiKey'] = System.getenv('AVES_GOOGLE_API_KEY') ?: '' - keystoreProperties['huaweiApiKey'] = System.getenv('AVES_HUAWEI_API_KEY') ?: '' + keystoreProperties["storeFile"] = System.getenv("AVES_STORE_FILE") ?: "" + keystoreProperties["storePassword"] = System.getenv("AVES_STORE_PASSWORD") ?: "" + keystoreProperties["keyAlias"] = System.getenv("AVES_KEY_ALIAS") ?: "" + keystoreProperties["keyPassword"] = System.getenv("AVES_KEY_PASSWORD") ?: "" + keystoreProperties["googleApiKey"] = System.getenv("AVES_GOOGLE_API_KEY") ?: "" + keystoreProperties["huaweiApiKey"] = System.getenv("AVES_HUAWEI_API_KEY") ?: "" } android { @@ -80,21 +80,21 @@ android { targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - manifestPlaceholders = [googleApiKey: keystoreProperties['googleApiKey'] ?: '', - huaweiApiKey: keystoreProperties['huaweiApiKey'] ?: ''] + manifestPlaceholders = [googleApiKey: keystoreProperties["googleApiKey"] ?: "", + huaweiApiKey: keystoreProperties["huaweiApiKey"] ?: ""] multiDexEnabled true } signingConfigs { release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null - storePassword keystoreProperties['storePassword'] + keyAlias keystoreProperties["keyAlias"] + keyPassword keystoreProperties["keyPassword"] + storeFile keystoreProperties["storeFile"] ? file(keystoreProperties["storeFile"]) : null + storePassword keystoreProperties["storePassword"] } } - flavorDimensions "store" + flavorDimensions = ["store"] productFlavors { play { @@ -208,7 +208,7 @@ dependencies { implementation 'com.caverock:androidsvg-aar:1.4' implementation 'com.commonsware.cwac:document:0.5.0' implementation 'com.drewnoakes:metadata-extractor:2.18.0' - implementation 'com.github.bumptech.glide:glide:4.15.1' + implementation "com.github.bumptech.glide:glide:$glide_version" // SLF4J implementation for `mp4parser` implementation 'org.slf4j:slf4j-simple:2.0.7' @@ -222,10 +222,10 @@ dependencies { implementation 'com.github.deckerst:pixymeta-android:706bd73d6e' // huawei flavor only - huaweiImplementation 'com.huawei.agconnect:agconnect-core:1.8.0.300' + huaweiImplementation "com.huawei.agconnect:agconnect-core:$huawei_agconnect_version" kapt 'androidx.annotation:annotation:1.6.0' - kapt 'com.github.bumptech.glide:compiler:4.15.1' + kapt "com.github.bumptech.glide:compiler:$glide_version" compileOnly rootProject.findProject(':streams_channel') } diff --git a/android/build.gradle b/android/build.gradle index c9ccd0367..d06c9b9c7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,9 @@ buildscript { ext { kotlin_version = '1.8.0' + agp_version = '7.4.2' + glide_version = '4.15.1' + huawei_agconnect_version = '1.8.0.300' abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4] useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") } useHms = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("huawei") } @@ -17,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath "com.android.tools.build:gradle:$agp_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" if (useCrashlytics) { @@ -28,7 +31,7 @@ buildscript { if (useHms) { // HMS (used by some flavors only) - classpath 'com.huawei.agconnect:agcp:1.8.0.300' + classpath "com.huawei.agconnect:agcp:$huawei_agconnect_version" } } } @@ -57,6 +60,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/plugins/aves_magnifier/pubspec.yaml b/plugins/aves_magnifier/pubspec.yaml index 14f197fcd..a45d38ae6 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_map/pubspec.yaml b/plugins/aves_map/pubspec.yaml index 8f325c421..25099293f 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_model/pubspec.yaml b/plugins/aves_model/pubspec.yaml index e07e9d4d0..4ce8c1284 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: '>=2.19.6 <3.0.0' + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_platform_meta/pubspec.yaml b/plugins/aves_platform_meta/pubspec.yaml index 67620cb1d..7bfc472b6 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_report/pubspec.yaml b/plugins/aves_report/pubspec.yaml index 14de85cf7..638daa043 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_report_console/pubspec.yaml b/plugins/aves_report_console/pubspec.yaml index 93fde45cf..337e24999 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_report_crashlytics/pubspec.yaml b/plugins/aves_report_crashlytics/pubspec.yaml index 1740651b8..2a4875ff3 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_screen_state/.gitignore b/plugins/aves_screen_state/.gitignore index 96486fd93..28124a571 100644 --- a/plugins/aves_screen_state/.gitignore +++ b/plugins/aves_screen_state/.gitignore @@ -23,7 +23,7 @@ migrate_working_dir/ # Flutter/Dart/Pub related # Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock +#/pubspec.lock **/doc/api/ .dart_tool/ .packages diff --git a/plugins/aves_screen_state/pubspec.lock b/plugins/aves_screen_state/pubspec.lock new file mode 100644 index 000000000..10b974b12 --- /dev/null +++ b/plugins/aves_screen_state/pubspec.lock @@ -0,0 +1,87 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + characters: + dependency: transitive + description: + name: characters + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" + source: hosted + version: "1.2.1" + collection: + dependency: transitive + description: + name: collection + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" + source: hosted + version: "1.17.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + url: "https://pub.dev" + source: hosted + version: "2.0.1" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" + lints: + dependency: transitive + description: + name: lints + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" + source: hosted + version: "0.2.0" + meta: + dependency: transitive + description: + name: meta + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" + source: hosted + version: "1.8.0" + plugin_platform_interface: + dependency: "direct main" + description: + name: plugin_platform_interface + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" +sdks: + dart: ">=2.19.6 <3.0.0" diff --git a/plugins/aves_screen_state/pubspec.yaml b/plugins/aves_screen_state/pubspec.yaml index fda5d6290..16d083441 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: '>=2.19.6 <3.0.0' + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_services/pubspec.yaml b/plugins/aves_services/pubspec.yaml index cb818794f..02ad742fe 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_services_google/pubspec.yaml b/plugins/aves_services_google/pubspec.yaml index 08a713a60..dc926c15b 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_services_huawei/pubspec.yaml b/plugins/aves_services_huawei/pubspec.yaml index 148a85401..8043804ce 100644 --- a/plugins/aves_services_huawei/pubspec.yaml +++ b/plugins/aves_services_huawei/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_services_none/pubspec.yaml b/plugins/aves_services_none/pubspec.yaml index 4d4d7651b..8ef4e9ad0 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_ui/pubspec.yaml b/plugins/aves_ui/pubspec.yaml index b7efcbcc0..526345b23 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: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_utils/pubspec.yaml b/plugins/aves_utils/pubspec.yaml index bdd6c1210..65152ff34 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: '>=2.19.6 <3.0.0' + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/plugins/aves_video/pubspec.yaml b/plugins/aves_video/pubspec.yaml index 7bde43cf3..51a036afd 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: '>=2.19.6 <3.0.0' + sdk: ">=2.19.6 <4.0.0" dependencies: flutter: diff --git a/pubspec.yaml b/pubspec.yaml index 8353b9c41..e1cf79658 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.7.12 - sdk: ">=2.19.6 <3.0.0" + sdk: ">=2.19.6 <4.0.0" # use `scripts/apply_flavor_{flavor}.sh` to set the right dependencies for the flavor dependencies: