From 81bae35cd392d94555417ec73b4fd2b6fb5278a2 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Sat, 18 Nov 2023 12:18:15 +0000 Subject: [PATCH 1/4] build: Upgraded FLutter to 3.16.0 --- .github/workflows/github_release.yml | 2 +- .github/workflows/test_build.yml | 4 ++-- submodules/flutter | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml index 9de5d0f6..15e253c3 100644 --- a/.github/workflows/github_release.yml +++ b/.github/workflows/github_release.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Flutter uses: subosito/flutter-action@v2 with: - flutter-version: "3.13.9" + flutter-version: "3.16.0" - name: Install dependencies run: flutter pub get diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 56d8be03..66593932 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -19,7 +19,7 @@ jobs: java-version: '11' - uses: subosito/flutter-action@v2 with: - flutter-version: '3.13.9' + flutter-version: '3.16.0' - name: Configure Keystore for Android run: | echo "$PLAY_STORE_UPLOAD_KEY" | base64 --decode > app/upload-keystore.jks @@ -46,7 +46,7 @@ jobs: java-version: '11' - uses: subosito/flutter-action@v2 with: - flutter-version: '3.13.9' + flutter-version: '3.16.0' - name: Configure Keystore for Android run: | echo "$PLAY_STORE_UPLOAD_KEY" | base64 --decode > app/upload-keystore.jks diff --git a/submodules/flutter b/submodules/flutter index d211f428..db7ef5bf 160000 --- a/submodules/flutter +++ b/submodules/flutter @@ -1 +1 @@ -Subproject commit d211f42860350d914a5ad8102f9ec32764dc6d06 +Subproject commit db7ef5bf9f59442b0e200a90587e8fa5e0c6336a From f8b5091afeb7be0945e209e0f6bd4751251cd3a0 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Sat, 18 Nov 2023 12:18:47 +0000 Subject: [PATCH 2/4] build: Upgraded dependencies --- pubspec.lock | 60 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 85e175db..2a82c3c7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" colour: dependency: transitive description: @@ -213,10 +213,10 @@ packages: dependency: transitive description: name: dbus - sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263" + sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" url: "https://pub.dev" source: hosted - version: "0.7.8" + version: "0.7.10" device_info_plus: dependency: "direct main" description: @@ -753,10 +753,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -905,10 +905,10 @@ packages: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.1" pigment: dependency: transitive description: @@ -929,10 +929,10 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8 url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.7" pointer_interceptor: dependency: transitive description: @@ -1041,10 +1041,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -1102,26 +1102,26 @@ packages: dependency: transitive description: name: sqflite_common - sha256: "8ed044102f3135add97be8653662052838859f5400075ef227f8ad72ae320803" + sha256: bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6 url: "https://pub.dev" source: hosted - version: "2.5.0+1" + version: "2.5.0+2" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -1150,10 +1150,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -1182,10 +1182,10 @@ packages: dependency: transitive description: name: url_launcher_ios - sha256: "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a" + sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3 url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.2.1" url_launcher_linux: dependency: transitive description: @@ -1246,18 +1246,18 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: name: win32 - sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f" url: "https://pub.dev" source: hosted - version: "5.0.9" + version: "5.1.0" win32_registry: dependency: transitive description: @@ -1278,10 +1278,10 @@ packages: dependency: transitive description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556 url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.4.2" yaml: dependency: transitive description: @@ -1291,5 +1291,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" From 8b0207e6f3bcde3ff20316340c0c9a9f269558c0 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Sat, 18 Nov 2023 12:25:00 +0000 Subject: [PATCH 3/4] ci: Added ios test build job --- .github/workflows/test_build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 66593932..9bd15c3b 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -63,3 +63,12 @@ jobs: - run: flutter pub get - run: flutter build -v appbundle + ios_build: + runs-on: macos-latest + steps: + - uses: actions/checkout@v3 + - uses: subosito/flutter-action@v2 + with: + flutter-version: '3.16.0' + - run: flutter pub get + - run: flutter build ios --no-codesign From c7c826edc6292e1a96af7a5f75d0c94533f0ff62 Mon Sep 17 00:00:00 2001 From: mateusz-bak <32651935+mateusz-bak@users.noreply.github.com> Date: Sat, 18 Nov 2023 12:25:58 +0000 Subject: [PATCH 4/4] fix: Initiating FlutterDisplayMode only for Android --- lib/main.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 890bcae9..393d7ba6 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -33,7 +33,10 @@ late GlobalKey snackbarKey; void main() async { WidgetsFlutterBinding.ensureInitialized(); await EasyLocalization.ensureInitialized(); - await FlutterDisplayMode.setHighRefreshRate(); + + if (Platform.isAndroid) { + await FlutterDisplayMode.setHighRefreshRate(); + } HydratedBloc.storage = await HydratedStorage.build( storageDirectory: await getApplicationDocumentsDirectory(),