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

upgraded Flutter to stable v3.13.8

Browse source 
target API 34
This commit is contained in:
Thibault Deckers 2023-10-19 00:42:04 +03:00
parent 5182fa1a34
commit 300d232b9b
16 changed files with 69 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.flutter

@ -1 +1 @@
Subproject commit 2f708eb8396e362e280fac22cf171c2cb467343c
Subproject commit 6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e

9
CHANGELOG.md
View file

@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
## <a id="unreleased"></a>[Unreleased]
### Changed
- target Android 14 (API 34)
- upgraded Flutter to stable v3.13.8
## <a id="v1.9.7"></a>[v1.9.7] - 2023-10-17
### Added
@ -15,12 +20,12 @@ All notable changes to this project will be documented in this file.
- mosaic layout: clamp ratio to 32/9
- Video: disable subtitles by default
- Map: Stamen Watercolor layer (no longer served for free by Stamen) now served by Smithsonian Institution
- Map: Stamen Watercolor layer (no longer hosted for free by Stamen) now hosted by Smithsonian Institution
- upgraded Flutter to stable v3.13.7
### Removed
- Map: Stamen Toner layer (no longer served for free by Stamen)
- Map: Stamen Toner layer (no longer hosted for free by Stamen)
### Fixed

6
android/app/build.gradle
View file

@ -76,14 +76,14 @@ android {
defaultConfig {
applicationId packageName
// minSdkVersion constraints:
// minSdk constraints:
// - Flutter & other plugins: 16
// - google_maps_flutter v2.1.1: 20
// - to build XML documents from XMP data, `metadata-extractor` and `PixyMeta` rely on `DocumentBuilder`,
// which implementation `DocumentBuilderImpl` is provided by the OS and is not customizable on Android,
// but the implementation on API <19 is not robust enough and fails to build XMP documents
minSdkVersion 19
targetSdkVersion 33
minSdk 19
targetSdk 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
manifestPlaceholders = [googleApiKey: keystoreProperties["googleApiKey"] ?: "<NONE>",

15
android/app/src/main/AndroidManifest.xml
View file

@ -33,10 +33,9 @@
<!-- to access media with original metadata with scoped storage (API >=29) -->
<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
<!-- to provide a foreground service type, as required by Android 14 (API 34) -->
<!-- TODO TLAD revisit with Android 14 >beta5 -->
<!-- <uses-permission-->
<!-- android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"-->
<!-- tools:ignore="SystemPermissionTypo" />-->
<uses-permission
android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"
tools:ignore="SystemPermissionTypo" />
<!-- TODO TLAD still needed to fetch map tiles / reverse geocoding / else ? check in release mode -->
<uses-permission android:name="android.permission.INTERNET" />
<!-- from Android 12 (API 31), users can optionally grant access to the media management special permission -->
@ -69,7 +68,7 @@
-->
<!--
allow install on API 19, despite the `minSdkVersion` declared in dependencies:
allow install on API 19, despite the `minSdk` declared in dependencies:
- Google Maps is from API 20
- the Security library is from API 21
- FFmpegKit for Flutter is from API 24 (when not LTS)
@ -248,6 +247,12 @@
</intent-filter>
</receiver>
<!-- anonymous service for analysis worker is specified here to provide service type -->
<service
android:name="androidx.work.impl.foreground.SystemForegroundService"
android:foregroundServiceType="dataSync"
tools:node="merge" />
<service
android:name=".MediaPlaybackService"
android:exported="false"

20
android/app/src/main/kotlin/deckers/thibault/aves/AnalysisWorker.kt
View file

@ -159,17 +159,15 @@ class AnalysisWorker(context: Context, parameters: WorkerParameters) : Coroutine
.setContentIntent(openAppIntent)
.addAction(stopAction)
.build()
// TODO TLAD revisit with Android 14 >beta5
return ForegroundInfo(NOTIFICATION_ID, notification);
// return if (Build.VERSION.SDK_INT >= 34) {
// // as of Android 14 beta 5, foreground service type is mandatory
// // despite the sample code omitting it at:
// // https://developer.android.com/guide/background/persistent/how-to/long-running
// val type = ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
// ForegroundInfo(NOTIFICATION_ID, notification, type)
// } else {
// ForegroundInfo(NOTIFICATION_ID, notification)
// }
return if (Build.VERSION.SDK_INT >= 34) {
// from Android 14 (API 34), foreground service type is mandatory
// despite the sample code omitting it at:
// https://developer.android.com/guide/background/persistent/how-to/long-running
val type = ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
ForegroundInfo(NOTIFICATION_ID, notification, type)
} else {
ForegroundInfo(NOTIFICATION_ID, notification)
}
}
companion object {

2
android/build.gradle
View file

@ -2,7 +2,7 @@ buildscript {
ext {
kotlin_version = '1.8.21'
ksp_version = "$kotlin_version-1.0.11"
agp_version = '7.4.2'
agp_version = '8.1.2'
glide_version = '4.16.0'
// AppGallery Connect plugin versions: https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-sdk-changenotes-0000001058732550
huawei_agconnect_version = '1.9.1.300'

2
android/gradle.properties
View file

@ -11,8 +11,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.defaults.buildfeatures.buildconfig=true

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip

6
plugins/aves_platform_meta/android/build.gradle
View file

@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
buildscript {
ext {
kotlin_version = '1.8.21'
agp_version = '8.0.1'
agp_version = '8.1.2'
}
repositories {
@ -30,7 +30,7 @@ apply plugin: 'kotlin-android'
android {
namespace 'deckers.thibault.aves.aves_platform_meta'
compileSdkVersion 33
compileSdk 34
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@ -52,6 +52,6 @@ android {
}
defaultConfig {
minSdkVersion 19
minSdk 19
}
}

2
plugins/aves_platform_meta/android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip

24
plugins/aves_report_crashlytics/pubspec.lock
View file

@ -5,10 +5,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
sha256: d84d98f1992976775f83083523a34c5d22fea191eec3abb2bd09537fb623c2e0
sha256: "2e3a565cdd40b32df6ff9a0d1f16b9144fcce769455597ee9195f568ffbb3a59"
url: "https://pub.dev"
source: hosted
version: "1.3.7"
version: "1.3.8"
async:
dependency: transitive
description:
@ -68,42 +68,42 @@ packages:
dependency: "direct main"
description:
name: firebase_core
sha256: "95580fa07c8ca3072a2bb1fecd792616a33f8683477d25b7d29d3a6a399e6ece"
sha256: "761d0a00562ba09d491eacdceaf1885df62d072c9431bf3110333e2a9904b1e1"
url: "https://pub.dev"
source: hosted
version: "2.17.0"
version: "2.18.0"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2
sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63
url: "https://pub.dev"
source: hosted
version: "4.8.0"
version: "5.0.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
sha256: e8c408923cd3a25bd342c576a114f2126769cd1a57106a4edeaa67ea4a84e962
sha256: "0631a2ec971dbc540275e2fa00c3a8a2676f0a7adbc3c197d6fba569db689d97"
url: "https://pub.dev"
source: hosted
version: "2.8.0"
version: "2.8.1"
firebase_crashlytics:
dependency: "direct main"
description:
name: firebase_crashlytics
sha256: "833cf891d10e5e819a2034048ff7e8882bcc0b51055c0e17f5fe3f3c3c177a9d"
sha256: "85f1098487d1b177bb4b7e0d552f57029d6964d2da665104d6299acce2f58bb6"
url: "https://pub.dev"
source: hosted
version: "3.3.7"
version: "3.4.0"
firebase_crashlytics_platform_interface:
dependency: transitive
description:
name: firebase_crashlytics_platform_interface
sha256: dfdf1172f35fc0b0132bc5ec815aed52c07643ee56732e6807ca7dc12f7fce86
sha256: "8bdcca9109595d353b467a97278becb726286596741b9cc0ace59abf9def9645"
url: "https://pub.dev"
source: hosted
version: "3.6.7"
version: "3.6.8"
flutter:
dependency: "direct main"
description: flutter

6
plugins/aves_screen_state/android/build.gradle
View file

@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
buildscript {
ext {
kotlin_version = '1.8.21'
agp_version = '8.0.1'
agp_version = '8.1.2'
}
repositories {
@ -30,7 +30,7 @@ apply plugin: 'kotlin-android'
android {
namespace 'deckers.thibault.aves.aves_screen_state'
compileSdkVersion 33
compileSdk 34
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@ -52,6 +52,6 @@ android {
}
defaultConfig {
minSdkVersion 19
minSdk 19
}
}

2
plugins/aves_screen_state/android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip

30
pubspec.lock
View file

@ -13,10 +13,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
sha256: d84d98f1992976775f83083523a34c5d22fea191eec3abb2bd09537fb623c2e0
sha256: "2e3a565cdd40b32df6ff9a0d1f16b9144fcce769455597ee9195f568ffbb3a59"
url: "https://pub.dev"
source: hosted
version: "1.3.7"
version: "1.3.8"
analyzer:
dependency: transitive
description:
@ -306,10 +306,10 @@ packages:
dependency: "direct main"
description:
name: dynamic_color
sha256: "96bff3df72e3d428bda2b874c7a521e8c86f592cae626ea594922fcc8d166e0c"
sha256: "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f"
url: "https://pub.dev"
source: hosted
version: "1.6.7"
version: "1.6.8"
equatable:
dependency: "direct main"
description:
@ -380,42 +380,42 @@ packages:
dependency: transitive
description:
name: firebase_core
sha256: "95580fa07c8ca3072a2bb1fecd792616a33f8683477d25b7d29d3a6a399e6ece"
sha256: "761d0a00562ba09d491eacdceaf1885df62d072c9431bf3110333e2a9904b1e1"
url: "https://pub.dev"
source: hosted
version: "2.17.0"
version: "2.18.0"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2
sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63
url: "https://pub.dev"
source: hosted
version: "4.8.0"
version: "5.0.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
sha256: e8c408923cd3a25bd342c576a114f2126769cd1a57106a4edeaa67ea4a84e962
sha256: "0631a2ec971dbc540275e2fa00c3a8a2676f0a7adbc3c197d6fba569db689d97"
url: "https://pub.dev"
source: hosted
version: "2.8.0"
version: "2.8.1"
firebase_crashlytics:
dependency: transitive
description:
name: firebase_crashlytics
sha256: "833cf891d10e5e819a2034048ff7e8882bcc0b51055c0e17f5fe3f3c3c177a9d"
sha256: "85f1098487d1b177bb4b7e0d552f57029d6964d2da665104d6299acce2f58bb6"
url: "https://pub.dev"
source: hosted
version: "3.3.7"
version: "3.4.0"
firebase_crashlytics_platform_interface:
dependency: transitive
description:
name: firebase_crashlytics_platform_interface
sha256: dfdf1172f35fc0b0132bc5ec815aed52c07643ee56732e6807ca7dc12f7fce86
sha256: "8bdcca9109595d353b467a97278becb726286596741b9cc0ace59abf9def9645"
url: "https://pub.dev"
source: hosted
version: "3.6.7"
version: "3.6.8"
flex_color_picker:
dependency: "direct main"
description:
@ -1729,4 +1729,4 @@ packages:
version: "3.1.2"
sdks:
dart: ">=3.1.0 <4.0.0"
flutter: ">=3.13.7"
flutter: ">=3.13.8"

2
pubspec.yaml
View file

@ -13,7 +13,7 @@ publish_to: none
environment:
# this project bundles Flutter SDK via `flutter_wrapper`
# cf https://github.com/passsy/flutter_wrapper
flutter: 3.13.7
flutter: 3.13.8
sdk: ">=3.0.0 <4.0.0"
# use `scripts/apply_flavor_{flavor}.sh` to set the right dependencies for the flavor

2
shaders.sksl.json
View file

File diff suppressed because one or more lines are too long