Skip to content

Commit

Permalink
feat: upgrade to Flutter 3.22 (#1517)
Browse files Browse the repository at this point in the history
  • Loading branch information
justinenerio authored Jul 11, 2024
1 parent e64191d commit 72fbb3a
Show file tree
Hide file tree
Showing 19 changed files with 312 additions and 266 deletions.
2 changes: 1 addition & 1 deletion .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"flutterSdkVersion": "3.16.5",
"flutterSdkVersion": "3.22.2",
"flavors": {}
}
4 changes: 2 additions & 2 deletions .github/workflows/check_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ concurrency:
cancel-in-progress: true

env:
FLUTTER_VERSION: "3.19.6"
DART_VERSION: "3.2.3"
FLUTTER_VERSION: "3.22.2"
DART_VERSION: "3.4.3"
DCM_VERSION: "1.17.0"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:
cancel-in-progress: true

env:
FLUTTER_VERSION: "3.19.6"
FLUTTER_VERSION: "3.22.2"

jobs:
e2e:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/solana_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:
cancel-in-progress: true

env:
FLUTTER_VERSION: "3.19.6"
FLUTTER_VERSION: "3.22.2"

jobs:
solana_coverage:
Expand Down
11 changes: 10 additions & 1 deletion packages/espressocash_app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if (project.hasProperty('dart-defines')) {

android {
compileSdkVersion 34
ndkVersion "25.1.8937393"
ndkVersion "26.1.10909125"

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand Down Expand Up @@ -85,6 +85,15 @@ android {
signingConfig signingConfigs.release
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
namespace 'com.pleasecrypto.flutter'
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.pleasecrypto.flutter">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.pleasecrypto.flutter">
xmlns:tools="http://schemas.android.com/tools">
<queries>
<intent>
<action android:name="android.intent.action.VIEW" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.pleasecrypto.flutter">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
11 changes: 11 additions & 0 deletions packages/espressocash_app/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ allprojects {
jcenter()
maven { url 'https://jitpack.io' }
}
subprojects {
afterEvaluate { project ->
if (project.hasProperty('android')) {
project.android {
if (namespace == null) {
namespace project.group
}
}
}
}
}
}

rootProject.buildDir = '../build'
Expand Down
3 changes: 3 additions & 0 deletions packages/espressocash_app/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.enableR8=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
Original file line number Diff line number Diff line change
Expand Up @@ -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-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
2 changes: 1 addition & 1 deletion packages/espressocash_app/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "com.android.application" version '8.4.0' apply false
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
id "com.google.gms.google-services" version "4.3.15" apply false
}
Expand Down
139 changes: 71 additions & 68 deletions packages/espressocash_app/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
PODS:
- Firebase/CoreOnly (10.24.0):
- FirebaseCore (= 10.24.0)
- Firebase/Installations (10.24.0):
- Firebase/CoreOnly (10.28.0):
- FirebaseCore (= 10.28.0)
- Firebase/Installations (10.28.0):
- Firebase/CoreOnly
- FirebaseInstallations (~> 10.24.0)
- Firebase/RemoteConfig (10.24.0):
- FirebaseInstallations (~> 10.28.0)
- Firebase/RemoteConfig (10.28.0):
- Firebase/CoreOnly
- FirebaseRemoteConfig (~> 10.24.0)
- firebase_app_installations (0.2.5-4):
- Firebase/Installations (= 10.24.0)
- FirebaseRemoteConfig (~> 10.28.0)
- firebase_app_installations (0.3.0-3):
- Firebase/Installations (= 10.28.0)
- firebase_core
- Flutter
- firebase_core (2.30.1):
- Firebase/CoreOnly (= 10.24.0)
- firebase_core (3.2.0):
- Firebase/CoreOnly (= 10.28.0)
- Flutter
- firebase_remote_config (4.4.4):
- Firebase/RemoteConfig (= 10.24.0)
- firebase_remote_config (5.0.3):
- Firebase/RemoteConfig (= 10.28.0)
- firebase_core
- Flutter
- FirebaseABTesting (10.24.0):
- FirebaseABTesting (10.29.0):
- FirebaseCore (~> 10.0)
- FirebaseCore (10.24.0):
- FirebaseCore (10.28.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.12)
- GoogleUtilities/Logger (~> 7.12)
- FirebaseCoreInternal (10.24.0):
- FirebaseCoreInternal (10.29.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseInstallations (10.24.0):
- FirebaseInstallations (10.28.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- FirebaseRemoteConfig (10.24.0):
- FirebaseRemoteConfig (10.28.0):
- FirebaseABTesting (~> 10.0)
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- FirebaseRemoteConfigInterop (~> 10.23)
- FirebaseSharedSwift (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseRemoteConfigInterop (10.24.0)
- FirebaseSharedSwift (10.24.0)
- FirebaseRemoteConfigInterop (10.29.0)
- FirebaseSharedSwift (10.29.0)
- Flutter (1.0.0)
- flutter_inappwebview_ios (0.0.1):
- Flutter
Expand All @@ -67,29 +67,29 @@ PODS:
- GoogleToolboxForMac/Defines (= 4.2.1)
- "GoogleToolboxForMac/NSData+zlib (4.2.1)":
- GoogleToolboxForMac/Defines (= 4.2.1)
- GoogleUtilities/Environment (7.13.0):
- GoogleUtilities/Environment (7.13.3):
- GoogleUtilities/Privacy
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.13.0):
- GoogleUtilities/Logger (7.13.3):
- GoogleUtilities/Environment
- GoogleUtilities/Privacy
- "GoogleUtilities/NSData+zlib (7.13.0)":
- "GoogleUtilities/NSData+zlib (7.13.3)":
- GoogleUtilities/Privacy
- GoogleUtilities/Privacy (7.13.0)
- GoogleUtilities/UserDefaults (7.13.0):
- GoogleUtilities/Privacy (7.13.3)
- GoogleUtilities/UserDefaults (7.13.3):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- GoogleUtilitiesComponents (1.1.0):
- GoogleUtilities/Logger
- GTMSessionFetcher/Core (3.4.1)
- GTMSessionFetcher/Core (3.5.0)
- image_picker_ios (0.0.1):
- Flutter
- integration_test (0.0.1):
- Flutter
- Intercom (17.0.2)
- Intercom (17.1.2)
- intercom_flutter (9.0.0):
- Flutter
- Intercom (= 17.0.2)
- Intercom (= 17.1.2)
- Mixpanel-swift (4.2.0):
- Mixpanel-swift/Complete (= 4.2.0)
- Mixpanel-swift/Complete (4.2.0)
Expand All @@ -113,7 +113,7 @@ PODS:
- GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
- MLImage (= 1.0.0-beta5)
- MLKitCommon (~> 11.0)
- mobile_scanner (5.0.2):
- mobile_scanner (5.1.1):
- Flutter
- GoogleMLKit/BarcodeScanning (~> 6.0.0)
- nanopb (2.30910.0):
Expand All @@ -129,18 +129,18 @@ PODS:
- FlutterMacOS
- permission_handler_apple (9.3.0):
- Flutter
- PromisesObjC (2.3.1)
- PromisesObjC (2.4.0)
- Ramp (4.0.1)
- ramp_flutter (1.0.1):
- Flutter
- Ramp
- rive_common (0.0.1):
- Flutter
- Sentry/HybridSDK (8.25.0)
- sentry_flutter (8.1.0):
- Sentry/HybridSDK (8.29.0)
- sentry_flutter (8.3.0):
- Flutter
- FlutterMacOS
- Sentry/HybridSDK (= 8.25.0)
- Sentry/HybridSDK (= 8.29.0)
- share (0.0.1):
- Flutter
- shared_preferences_foundation (0.0.1):
Expand All @@ -149,18 +149,21 @@ PODS:
- sqflite (0.0.3):
- Flutter
- FlutterMacOS
- "sqlite3 (3.45.3+1)":
- "sqlite3/common (= 3.45.3+1)"
- "sqlite3/common (3.45.3+1)"
- "sqlite3/fts5 (3.45.3+1)":
- "sqlite3 (3.46.0+1)":
- "sqlite3/common (= 3.46.0+1)"
- "sqlite3/common (3.46.0+1)"
- "sqlite3/dbstatvtab (3.46.0+1)":
- sqlite3/common
- "sqlite3/perf-threadsafe (3.45.3+1)":
- "sqlite3/fts5 (3.46.0+1)":
- sqlite3/common
- "sqlite3/rtree (3.45.3+1)":
- "sqlite3/perf-threadsafe (3.46.0+1)":
- sqlite3/common
- "sqlite3/rtree (3.46.0+1)":
- sqlite3/common
- sqlite3_flutter_libs (0.0.1):
- Flutter
- "sqlite3 (~> 3.45.3+1)"
- "sqlite3 (~> 3.46.0+1)"
- sqlite3/dbstatvtab
- sqlite3/fts5
- sqlite3/perf-threadsafe
- sqlite3/rtree
Expand Down Expand Up @@ -283,57 +286,57 @@ CHECKOUT OPTIONS:
:tag: 4.0.1

SPEC CHECKSUMS:
Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
firebase_app_installations: a83011373deea8e62b295e15e31328fca8f426a2
firebase_core: 7f1e1156934d0da3be260174812842df9420e4ab
firebase_remote_config: bb9853d3dbca8dc788152371fdfefe982e25a2c8
FirebaseABTesting: 4431c2c56ac6e56f463b9cab05cc111078639f99
FirebaseCore: 11dc8a16dfb7c5e3c3f45ba0e191a33ac4f50894
FirebaseCoreInternal: bcb5acffd4ea05e12a783ecf835f2210ce3dc6af
FirebaseInstallations: 8f581fca6478a50705d2bd2abd66d306e0f5736e
FirebaseRemoteConfig: 95dddc50496b37eef199dadce850d5652b534b43
FirebaseRemoteConfigInterop: 6c349a466490aeace3ce9c091c86be1730711634
FirebaseSharedSwift: 76e1529c32101d80e4f1ca2fba7c39d59f0a390a
Firebase: 5121c624121af81cbc81df3bda414b3c28c4f3c3
firebase_app_installations: 81d9c2623601d3195b334e6e19bea0c801b8c4b3
firebase_core: a9d0180d5285527884d07a41eb4a9ec9ed12cdb6
firebase_remote_config: 5f92bfc62c3ef2c657bf3d703ffa4be29082280f
FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
FirebaseCore: 857dc1c6dd1255675047404d8466f7dfaac5d779
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
FirebaseInstallations: 60c1d3bc1beef809fd1ad1189a8057a040c59f2e
FirebaseRemoteConfig: f0879a8dccf4e8905716ed849569130efaeab3e2
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065
GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd
image_picker_ios: b545a5f16c0fa88e3ecbbce3ed4de45567a8ec18
integration_test: 13825b8a9334a850581300559b8839134b124670
Intercom: afe74dd6b8cdd422c29e5ff90811a0568b44b119
intercom_flutter: b592a484135502e12a17063616392810ede02a0b
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
Intercom: 5f6d8c6f82a79ff6e3316029f71578c7ecdf1250
intercom_flutter: 55f6371b5e745fb4588ac19d6ba9a5e673320c8f
Mixpanel-swift: e5dd85295923e6a875acf17ccbab8d2ecb10ea65
mixpanel_flutter: ed1e5eaea382cbbaf655d20e23478211727ee011
MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b
MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1
MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1
mobile_scanner: cfc76f77dca7e074fc9ca5993e3e7c35901c8b34
mobile_scanner: 8564358885a9253c43f822435b70f9345c87224f
nanopb: 438bc412db1928dac798aa6fd75726007be04262
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
Ramp: 3f843fb75cac12ad40842afa3226bae36dc93521
ramp_flutter: aac85dee8bc93b5f7563c909ba15a37727fe3fe8
rive_common: 8630be7f6385198f9d31a5bc8cd7f6ccccedf5a1
Sentry: cd86fc55628f5b7c572cabe66cc8f95a9d2f165a
sentry_flutter: ca7760fc008dc3bc2981730dc0c1d2f892178370
rive_common: cbbac3192af00d7341f19dae2f26298e9e37d99e
Sentry: 016de45ee5ce5fca2a829996f1bfafeb5e62e8b4
sentry_flutter: 5fb57c5b7e6427a9dc1fedde4269eb65823982d4
share: 0b2c3e82132f5888bccca3351c504d0003b3b410
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a
sqlite3_flutter_libs: 9bfe005308998aeca155330bbc2ea6dddf834a3b
sqlite3: 292c3e1bfe89f64e51ea7fc7dab9182a017c8630
sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe

PODFILE CHECKSUM: c2878e103071f1a812f2f4e4c83a762aef964055

COCOAPODS: 1.15.2
COCOAPODS: 1.13.0
4 changes: 2 additions & 2 deletions packages/espressocash_app/lib/ui/app_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class _CpAppBarState extends State<CpAppBar> {
automaticallyImplyLeading: widget.automaticallyImplyLeading,
backgroundColor: scrolledUnderColor == null
? widget.backgroundColor
: MaterialStateColor.resolveWith(
(states) => states.contains(MaterialState.scrolledUnder)
: WidgetStateColor.resolveWith(
(states) => states.contains(WidgetState.scrolledUnder)
? scrolledUnderColor
: widget.backgroundColor,
),
Expand Down
Loading

0 comments on commit 72fbb3a

Please sign in to comment.