Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor

Browse source
This commit is contained in:
Thibault Deckers 2023-05-08 18:42:18 +02:00
parent 3dc699766d
commit c94fc7245e
20 changed files with 126 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
android/app/build.gradle
View file

@ -36,12 +36,12 @@ if (keystorePropertiesFile.exists()) {
// for release using credentials in environment variables set up by GitHub Actions // for release using credentials in environment variables set up by GitHub Actions
// warning: in property file, single quotes should be escaped with a backslash // warning: in property file, single quotes should be escaped with a backslash
// but they should not be escaped when stored in env variables // but they should not be escaped when stored in env variables
keystoreProperties['storeFile'] = System.getenv('AVES_STORE_FILE') ?: '<NONE>' keystoreProperties["storeFile"] = System.getenv("AVES_STORE_FILE") ?: "<NONE>"
keystoreProperties['storePassword'] = System.getenv('AVES_STORE_PASSWORD') ?: '<NONE>' keystoreProperties["storePassword"] = System.getenv("AVES_STORE_PASSWORD") ?: "<NONE>"
keystoreProperties['keyAlias'] = System.getenv('AVES_KEY_ALIAS') ?: '<NONE>' keystoreProperties["keyAlias"] = System.getenv("AVES_KEY_ALIAS") ?: "<NONE>"
keystoreProperties['keyPassword'] = System.getenv('AVES_KEY_PASSWORD') ?: '<NONE>' keystoreProperties["keyPassword"] = System.getenv("AVES_KEY_PASSWORD") ?: "<NONE>"
keystoreProperties['googleApiKey'] = System.getenv('AVES_GOOGLE_API_KEY') ?: '<NONE>' keystoreProperties["googleApiKey"] = System.getenv("AVES_GOOGLE_API_KEY") ?: "<NONE>"
keystoreProperties['huaweiApiKey'] = System.getenv('AVES_HUAWEI_API_KEY') ?: '<NONE>' keystoreProperties["huaweiApiKey"] = System.getenv("AVES_HUAWEI_API_KEY") ?: "<NONE>"
} }
android { android {
@ -80,21 +80,21 @@ android {
targetSdkVersion 33 targetSdkVersion 33
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
manifestPlaceholders = [googleApiKey: keystoreProperties['googleApiKey'] ?: '<NONE>', manifestPlaceholders = [googleApiKey: keystoreProperties["googleApiKey"] ?: "<NONE>",
huaweiApiKey: keystoreProperties['huaweiApiKey'] ?: '<NONE>'] huaweiApiKey: keystoreProperties["huaweiApiKey"] ?: "<NONE>"]
multiDexEnabled true multiDexEnabled true
} }
signingConfigs { signingConfigs {
release { release {
keyAlias keystoreProperties['keyAlias'] keyAlias keystoreProperties["keyAlias"]
keyPassword keystoreProperties['keyPassword'] keyPassword keystoreProperties["keyPassword"]
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null storeFile keystoreProperties["storeFile"] ? file(keystoreProperties["storeFile"]) : null
storePassword keystoreProperties['storePassword'] storePassword keystoreProperties["storePassword"]
} }
} }
flavorDimensions "store" flavorDimensions = ["store"]
productFlavors { productFlavors {
play { play {
@ -208,7 +208,7 @@ dependencies {
implementation 'com.caverock:androidsvg-aar:1.4' implementation 'com.caverock:androidsvg-aar:1.4'
implementation 'com.commonsware.cwac:document:0.5.0' implementation 'com.commonsware.cwac:document:0.5.0'
implementation 'com.drewnoakes:metadata-extractor:2.18.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` // SLF4J implementation for `mp4parser`
implementation 'org.slf4j:slf4j-simple:2.0.7' implementation 'org.slf4j:slf4j-simple:2.0.7'
@ -222,10 +222,10 @@ dependencies {
implementation 'com.github.deckerst:pixymeta-android:706bd73d6e' implementation 'com.github.deckerst:pixymeta-android:706bd73d6e'
// huawei flavor only // 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 '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') compileOnly rootProject.findProject(':streams_channel')
} }

9
android/build.gradle
View file

@ -1,6 +1,9 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '1.8.0' 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] abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") } useCrashlytics = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("play") }
useHms = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("huawei") } useHms = gradle.startParameter.taskNames.any { task -> task.containsIgnoreCase("huawei") }
@ -17,7 +20,7 @@ buildscript {
} }
dependencies { 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" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
if (useCrashlytics) { if (useCrashlytics) {
@ -28,7 +31,7 @@ buildscript {
if (useHms) { if (useHms) {
// HMS (used by some flavors only) // 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') project.evaluationDependsOn(':app')
} }
task clean(type: Delete) { tasks.register('clean', Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

2
plugins/aves_magnifier/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_map/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_model/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: '>=2.19.6 <3.0.0' sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_platform_meta/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_report/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_report_console/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_report_crashlytics/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_screen_state/.gitignore vendored
View file

@ -23,7 +23,7 @@ migrate_working_dir/
# Flutter/Dart/Pub related # Flutter/Dart/Pub related
# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. # Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
/pubspec.lock #/pubspec.lock
**/doc/api/ **/doc/api/
.dart_tool/ .dart_tool/
.packages .packages

87
plugins/aves_screen_state/pubspec.lock Normal file
View file

@ -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"

2
plugins/aves_screen_state/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: '>=2.19.6 <3.0.0' sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_services/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_services_google/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_services_huawei/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_services_none/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_ui/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: ">=2.19.6 <3.0.0" sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_utils/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: '>=2.19.6 <3.0.0' sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
plugins/aves_video/pubspec.yaml
View file

@ -3,7 +3,7 @@ version: 0.0.1
publish_to: none publish_to: none
environment: environment:
sdk: '>=2.19.6 <3.0.0' sdk: ">=2.19.6 <4.0.0"
dependencies: dependencies:
flutter: flutter:

2
pubspec.yaml
View file

@ -14,7 +14,7 @@ environment:
# this project bundles Flutter SDK via `flutter_wrapper` # this project bundles Flutter SDK via `flutter_wrapper`
# cf https://github.com/passsy/flutter_wrapper # cf https://github.com/passsy/flutter_wrapper
flutter: 3.7.12 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 # use `scripts/apply_flavor_{flavor}.sh` to set the right dependencies for the flavor
dependencies: dependencies: