Skip to content

Commit 5901208

Browse files
authored
Merge pull request #3 from renefloor/feature/upgrade-to-flutter-3
Upgrade to Flutter 3
2 parents 63fa201 + adfbf20 commit 5901208

File tree

12 files changed

+439
-293
lines changed

12 files changed

+439
-293
lines changed

.github/workflows/build_android_store.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: subosito/flutter-action@v2
2828
with:
29-
flutter-version: 2.10.3
29+
flutter-version: 3.16.0
3030
channel: stable
3131
cache: true
3232

@@ -47,4 +47,4 @@ jobs:
4747
packageName: nl.renefloor.puzzle
4848
releaseFiles: build/app/outputs/bundle/release/app-release.aab
4949
track: internal
50-
mappingFile: build/app/outputs/mapping/release/mapping.txt
50+
mappingFile: build/app/outputs/mapping/release/mapping.txt

.github/workflows/build_microsoft_store.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- uses: subosito/flutter-action@v2
2424
with:
25-
flutter-version: 2.10.3
25+
flutter-version: 3.16.0
2626
channel: stable
2727
cache: true
2828

@@ -59,4 +59,4 @@ jobs:
5959
client-id: ${{ secrets.AZURE_AD_APPLICATION_CLIENT_ID }}
6060
client-secret: ${{ secrets.AZURE_AD_APPLICATION_SECRET }}
6161
app-id: ${{ secrets.WINDOWS_STORE_APP_ID }}
62-
package-path: "${{ github.workspace }}/release"
62+
package-path: "${{ github.workspace }}/release"

.github/workflows/deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- uses: subosito/flutter-action@v2
2626
with:
27-
flutter-version: 2.10.3
27+
flutter-version: 3.16.0
2828
channel: stable
2929
cache: true
3030

@@ -65,7 +65,7 @@ jobs:
6565

6666
- uses: subosito/flutter-action@v2
6767
with:
68-
flutter-version: 2.10.3
68+
flutter-version: 3.16.0
6969
channel: stable
7070
cache: true
7171

.github/workflows/deploy_develop.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: subosito/flutter-action@v2
2525
with:
26-
flutter-version: 2.10.3
26+
flutter-version: 3.16.0
2727
channel: stable
2828
cache: true
2929

.github/workflows/pr_preview.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
- uses: subosito/flutter-action@v2
2222
with:
23-
flutter-version: 2.10.3
23+
flutter-version: 3.16.0
2424
channel: stable
2525
cache: true
2626

ios/Runner/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,7 @@
4848
</array>
4949
<key>UIViewControllerBasedStatusBarAppearance</key>
5050
<false/>
51+
<key>CADisableMinimumFrameDurationOnPhone</key>
52+
<true/>
5153
</dict>
5254
</plist>

linux/flutter/generated_plugins.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
66
url_launcher_linux
77
)
88

9+
list(APPEND FLUTTER_FFI_PLUGIN_LIST
10+
)
11+
912
set(PLUGIN_BUNDLED_LIBRARIES)
1013

1114
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
1417
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
1518
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
1619
endforeach(plugin)
20+
21+
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
22+
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
23+
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
24+
endforeach(ffi_plugin)

macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ import Foundation
77

88
import audio_session
99
import just_audio
10-
import path_provider_macos
11-
import shared_preferences_macos
10+
import path_provider_foundation
11+
import rive_common
12+
import shared_preferences_foundation
1213
import url_launcher_macos
1314

1415
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
1516
AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
1617
JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin"))
1718
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
19+
RivePlugin.register(with: registry.registrar(forPlugin: "RivePlugin"))
1820
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
1921
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
2022
}

0 commit comments

Comments
 (0)