Skip to content

Commit dd07179

Browse files
bump version to 1.4.12; update dependencies; update GH actions
1 parent d9611de commit dd07179

File tree

9 files changed

+242
-231
lines changed

9 files changed

+242
-231
lines changed

.github/workflows/CI_windows.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ on:
55
branches:
66
- master
77
- mgrr
8-
- gh-actions
8+
pull_request:
9+
branches:
10+
- master
11+
- mgrr
912

1013
jobs:
1114
flutter-build:
@@ -35,7 +38,9 @@ jobs:
3538
- name: Setup Flutter
3639
uses: subosito/flutter-action@v2
3740
with:
38-
flutter-version: '3.24.4'
41+
channel: stable
42+
flutter-version-file: pubspec.yaml
43+
cache: true
3944

4045
- name: Get Packages
4146
run: flutter pub get

lib/fileTypeUtils/audio/audioModPacker.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Future<void> packAudioMod(String waiPath) async {
102102
var zipEncoder = ZipFileEncoder();
103103
zipEncoder.create(savePath);
104104
await zipEncoder.addDirectory(Directory(tempDir.path), includeDirName: false);
105-
zipEncoder.close();
105+
await zipEncoder.close();
106106
await tempDir.delete(recursive: true);
107107

108108
showToast("Done");

lib/fileTypeUtils/audio/modInstaller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Future<void> installMod(String waiPath) async {
2828
List<String> changedFiles = [];
2929
try {
3030
var fs = InputFileStream(zipPath);
31-
var archive = ZipDecoder().decodeBuffer(fs);
31+
var archive = ZipDecoder().decodeStream(fs);
3232
await extractArchiveToDisk(archive, tmpDir.path);
3333
await fs.close();
3434

lib/fileTypeUtils/audio/wavToWemConverter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Future<String> _makeWwiseProject(bool isBgm) async {
1919
String tempProjectDir = (await Directory.systemTemp.createTemp("wwiseProject")).path;
2020

2121
var fs = InputFileStream(wwiseProjectTemplate);
22-
var archive = ZipDecoder().decodeBuffer(fs);
22+
var archive = ZipDecoder().decodeStream(fs);
2323
await extractArchiveToDisk(archive, tempProjectDir);
2424
await fs.close();
2525

lib/version/version.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class FServoVersion {
8383
}
8484
}
8585

86-
const version = FServoVersion(1, 4, 10, _masterBranch);
86+
const version = FServoVersion(1, 4, 12, _masterBranch);
8787

8888
const branches = [_masterBranch, "mgrr"];
8989

lib/widgets/tools/ddsTools.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,11 @@ class _DdsToolState extends State<DdsTool> {
143143
Padding(
144144
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
145145
child: DottedBorder(
146-
strokeWidth: 2,
147-
color: getTheme(context).textColor!.withOpacity(0.25),
148-
radius: const Radius.circular(12),
149-
borderType: BorderType.RRect,
146+
options: RoundedRectDottedBorderOptions(
147+
strokeWidth: 2,
148+
color: getTheme(context).textColor!.withOpacity(0.25),
149+
radius: const Radius.circular(12),
150+
),
150151
child: Container(
151152
decoration: BoxDecoration(
152153
color: Colors.black.withOpacity(0.25),

macos/Flutter/GeneratedPluginRegistrant.swift

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

88
import audioplayers_darwin
99
import desktop_drop
10+
import file_picker
1011
import flutter_window_close
1112
import path_provider_foundation
1213
import screen_retriever_macos
@@ -18,6 +19,7 @@ import window_manager
1819
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
1920
AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin"))
2021
DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
22+
FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
2123
FlutterWindowClosePlugin.register(with: registry.registrar(forPlugin: "FlutterWindowClosePlugin"))
2224
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
2325
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))

0 commit comments

Comments
 (0)