deps: Support Flutter 3.22 and WASM

Oberhauser-Dev · May 16, 2024 · 020177d · 020177d
1 parent 4df0e5e
commit 020177d
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 107 deletions.
diff --git a/.github/workflows/build-client.yml b/.github/workflows/build-client.yml
@@ -9,6 +9,7 @@ on:
         type: choice
         options:
           - 'any'
+          - '3.22.x'
           - '3.19.x'
       enable_android:
         description: 'Build Android'
@@ -49,7 +50,7 @@ on:
     inputs:
       flutter_version:
         required: false
-        default: '3.19.5'
+        default: '3.22.0'
         type: string
       enable_android:
         required: false
@@ -138,6 +139,7 @@ jobs:
           flutter build ${{ matrix.build-type }} \
             ${{ matrix.platform == 'android' && '--debug' || '--release' }} \
             ${{ matrix.platform == 'ios' && '--no-codesign' || '' }} \
+            ${{ matrix.platform == 'web' && '--wasm' || '' }} \
             ${{ matrix.platform == 'web' && inputs.upload_pages_artifact && '--base-href "/wrestling_scoreboard/"' || '' }} \
             --build-name=0.0.0-nightly.${GITHUB_SHA::7} \
             --dart-define=API_URL=https://server.wrestling-scoreboard.oberhauser.dev/api \

diff --git a/.github/workflows/build-server.yml b/.github/workflows/build-server.yml
@@ -9,12 +9,13 @@ on:
         type: choice
         options:
           - 'any'
+          - '3.22.x'
           - '3.19.x'
   workflow_call:
     inputs:
       flutter_version:
         required: false
-        default: '3.19.5'
+        default: '3.22.0'
         type: string
 
 jobs:

diff --git a/.github/workflows/release-client.yml b/.github/workflows/release-client.yml
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.19.5'
+          flutter-version: '3.22.0'
           channel: 'stable'
       - uses: bluefireteam/melos-action@v3
       - uses: actions/setup-java@v4
@@ -80,6 +80,7 @@ jobs:
           build-type: ${{ matrix.build-type }}
           token: ${{ github.token }}
           build-args: |-
+            ${{ matrix.platform == 'web' && '--wasm' || '' }}
             --dart-define=APP_ENVIRONMENT=production
             --dart-define=API_URL=https://server.wrestling-scoreboard.oberhauser.dev/api
             --dart-define=WEB_SOCKET_URL=wss://server.wrestling-scoreboard.oberhauser.dev/ws
@@ -115,7 +116,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.19.5'
+          flutter-version: '3.22.0'
           channel: 'stable'
       - uses: actions/setup-java@v4
         if: matrix.platform == 'android'
@@ -140,6 +141,7 @@ jobs:
           tag: ${{ github.ref }}
           token: ${{ github.token }}
           build-args: |-
+            ${{ matrix.platform == 'web' && '--wasm' || '' }}
             --dart-define=APP_ENVIRONMENT=production
             --dart-define=API_URL=https://server.wrestling-scoreboard.oberhauser.dev/api
             --dart-define=WEB_SOCKET_URL=wss://server.wrestling-scoreboard.oberhauser.dev/ws

diff --git a/.github/workflows/release-server.yml b/.github/workflows/release-server.yml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.19.5'
+          flutter-version: '3.22.0'
           channel: 'stable'
       - uses: bluefireteam/melos-action@v3
       - name: Release
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.19.5'
+          flutter-version: '3.22.0'
           channel: 'stable'
       - uses: bluefireteam/melos-action@v3
       - name: Deploy

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,8 +9,8 @@ on:
         type: choice
         options:
           - 'any'
+          - '3.22.x'
           - '3.19.x'
-          - '3.16.x'
       flutter_channel:
         description: 'Flutter Channel'
         required: false
@@ -31,7 +31,7 @@ on:
     inputs:
       flutter_version:
         required: false
-        default: '3.19.5'
+        default: '3.22.0'
         type: string
       flutter_channel:
         required: false

diff --git a/wrestling_scoreboard_client/.metadata b/wrestling_scoreboard_client/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "7482962148e8d758338d8a28f589f317e1e42ba4"
+  revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
   channel: "stable"
 
 project_type: app
@@ -13,17 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
-      base_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
-    - platform: android
-      create_revision: ba393198430278b6595976de84fe170f553cc728
-      base_revision: ba393198430278b6595976de84fe170f553cc728
-    - platform: ios
-      create_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
-      base_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
-    - platform: macos
-      create_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
-      base_revision: 7482962148e8d758338d8a28f589f317e1e42ba4
+      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+    - platform: web
+      create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
+      base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
 
   # User provided section
 

diff --git a/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_display.dart b/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_display.dart
@@ -414,7 +414,7 @@ class BoutState extends ConsumerState<BoutScreen> {
     double padding = width / 100;
     final bottomPadding = EdgeInsets.only(bottom: padding);
 
-    Color stopwatchColor = stopwatch == _breakStopwatch ? Colors.orange : Theme.of(context).colorScheme.onBackground;
+    Color stopwatchColor = stopwatch == _breakStopwatch ? Colors.orange : Theme.of(context).colorScheme.onSurface;
 
     final shareAction = IconButton(
       icon: const Icon(Icons.share),

diff --git a/wrestling_scoreboard_client/lib/view/widgets/themed.dart b/wrestling_scoreboard_client/lib/view/widgets/themed.dart
@@ -19,7 +19,7 @@ class ThemedContainer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final textColor =
-        ThemeData.estimateBrightnessForColor(color ?? Theme.of(context).colorScheme.background) == Brightness.light
+        ThemeData.estimateBrightnessForColor(color ?? Theme.of(context).colorScheme.surface) == Brightness.light
             ? Colors.black
             : Colors.white;
     return Container(