Skip to content

Commit 5a60ed5

Browse files
Adrian-SamotichaAdrian-Samoticha
authored
Merge pull request #66 from EchoEllet/feat/swift-package-manager
Add support for Swift package manager
2 parents e5b274f + bdb0368 commit 5a60ed5

34 files changed

+107
-49
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ build/
1010
pubspec.lock
1111
.vscode/settings.json
1212
.idea/workspace.xml
13+
14+
# Swift package manager
15+
.build/
16+
.swiftpm/

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.8.2
2+
- Add support for Swift Package Manager. (Thanks to [@EchoEllet](https://github.com/EchoEllet)!)
3+
- Migrate away from deprecated interfaces.
4+
- Add missing documentation to `WindowManipulator.updateToolbarPassthroughView` and `WindowManipulator.removeToolbarPassthroughView`.
5+
16
## 1.8.1
27
- Provide support for older Swift compiler versions.
38

‎example/lib/main_area/window_manipulator_demo/command_list/description_box.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class DescriptionBox extends StatelessWidget {
2727
child: Text(
2828
'This command has no description.',
2929
textAlign: TextAlign.center,
30-
textScaleFactor: 0.8,
30+
textScaler: TextScaler.linear(0.8),
3131
style: TextStyle(
3232
fontStyle: FontStyle.italic,
3333
),

‎example/lib/main_area/window_manipulator_demo/command_list_provider/command_list_provider.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'dart:async';
2-
import 'dart:ui';
32

43
import 'package:example/main_area/window_manipulator_demo/command_list_provider/command_list_provider_constants.dart';
5-
import 'package:flutter/foundation.dart';
64
import 'package:flutter/material.dart';
75
import 'package:macos_window_utils/macos/ns_window_button_type.dart';
86
import 'package:macos_window_utils/macos/ns_window_level.dart';

‎example/lib/toolbar_passthrough_demo/tab_example.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:example/global_state.dart';
44
import 'package:flutter/gestures.dart';
55
import 'package:flutter/material.dart';
66
import 'package:flutter/scheduler.dart';
7-
import 'package:flutter/widgets.dart';
87
import 'package:macos_window_utils/macos_window_utils.dart';
98
import 'package:macos_window_utils/widgets/macos_toolbar_passthrough.dart';
109

‎example/macos/Podfile.lock‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,20 @@ PODS:
22
- appkit_ui_element_colors (1.0.0):
33
- FlutterMacOS
44
- FlutterMacOS (1.0.0)
5-
- macos_window_utils (1.0.0):
6-
- FlutterMacOS
75

86
DEPENDENCIES:
97
- appkit_ui_element_colors (from `Flutter/ephemeral/.symlinks/plugins/appkit_ui_element_colors/macos`)
108
- FlutterMacOS (from `Flutter/ephemeral`)
11-
- macos_window_utils (from `Flutter/ephemeral/.symlinks/plugins/macos_window_utils/macos`)
129

1310
EXTERNAL SOURCES:
1411
appkit_ui_element_colors:
1512
:path: Flutter/ephemeral/.symlinks/plugins/appkit_ui_element_colors/macos
1613
FlutterMacOS:
1714
:path: Flutter/ephemeral
18-
macos_window_utils:
19-
:path: Flutter/ephemeral/.symlinks/plugins/macos_window_utils/macos
2015

2116
SPEC CHECKSUMS:
2217
appkit_ui_element_colors: 711e7a2aa027790964e6fd90c78a666efe631432
2318
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
24-
macos_window_utils: 3bca8603c2a1cf2257351dfe6bbccc9accf739fd
2519

2620
PODFILE CHECKSUM: 500e4707112a5f11963bc198135953cdebb6d50c
2721

‎example/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
2828
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
2929
FAE3DC00BDFD51D7C70C8495 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6BA76D28627105B3BD31E6F /* Pods_Runner.framework */; };
30+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
3031
/* End PBXBuildFile section */
3132

3233
/* Begin PBXContainerItemProxy section */
@@ -80,6 +81,7 @@
8081
isa = PBXFrameworksBuildPhase;
8182
buildActionMask = 2147483647;
8283
files = (
84+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
8385
FAE3DC00BDFD51D7C70C8495 /* Pods_Runner.framework in Frameworks */,
8486
);
8587
runOnlyForDeploymentPostprocessing = 0;
@@ -174,6 +176,9 @@
174176

175177
/* Begin PBXNativeTarget section */
176178
33CC10EC2044A3C60003C045 /* Runner */ = {
179+
packageProductDependencies = (
180+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
181+
);
177182
isa = PBXNativeTarget;
178183
buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
179184
buildPhases = (
@@ -199,6 +204,9 @@
199204

200205
/* Begin PBXProject section */
201206
33CC10E52044A3C60003C045 /* Project object */ = {
207+
packageReferences = (
208+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
209+
);
202210
isa = PBXProject;
203211
attributes = {
204212
LastSwiftUpdateCheck = 0920;
@@ -633,6 +641,18 @@
633641
defaultConfigurationName = Release;
634642
};
635643
/* End XCConfigurationList section */
644+
/* Begin XCLocalSwiftPackageReference section */
645+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
646+
isa = XCLocalSwiftPackageReference;
647+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
648+
};
649+
/* End XCLocalSwiftPackageReference section */
650+
/* Begin XCSwiftPackageProductDependency section */
651+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
652+
isa = XCSwiftPackageProductDependency;
653+
productName = FlutterGeneratedPluginSwiftPackage;
654+
};
655+
/* End XCSwiftPackageProductDependency section */
636656
};
637657
rootObject = 33CC10E52044A3C60003C045 /* Project object */;
638658
}

‎example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Prepare Flutter Framework Script"
13+
scriptText = "&quot;$FLUTTER_ROOT&quot;/packages/flutter_tools/bin/macos_assemble.sh prepare&#10;">
14+
<EnvironmentBuildable>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
18+
BuildableName = "example.app"
19+
BlueprintName = "Runner"
20+
ReferencedContainer = "container:Runner.xcodeproj">
21+
</BuildableReference>
22+
</EnvironmentBuildable>
23+
</ActionContent>
24+
</ExecutionAction>
25+
</PreActions>
826
<BuildActionEntries>
927
<BuildActionEntry
1028
buildForTesting = "YES"
@@ -48,6 +66,7 @@
4866
ignoresPersistentStateOnLaunch = "NO"
4967
debugDocumentVersioning = "YES"
5068
debugServiceExtension = "internal"
69+
enableGPUValidationMode = "1"
5170
allowLocationSimulation = "YES">
5271
<BuildableProductRunnable
5372
runnableDebuggingMode = "0">

‎lib/toolbars/toolbars.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class BlockingToolbar extends Toolbar {
3737
return {
3838
"blockingAreaDebugColor": blockingAreaDebugColor == null
3939
? ""
40-
: "${blockingAreaDebugColor!.red},${blockingAreaDebugColor!.green},${blockingAreaDebugColor!.blue},${blockingAreaDebugColor!.alpha}",
40+
: "${blockingAreaDebugColor!.r},${blockingAreaDebugColor!.g},${blockingAreaDebugColor!.b},${blockingAreaDebugColor!.a}",
4141
};
4242
}
4343
}

‎lib/widgets/macos_toolbar_passthrough.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import 'dart:collection';
1919

2020
import 'package:flutter/material.dart';
2121
import 'package:flutter/rendering.dart';
22-
import 'package:flutter/services.dart';
2322
import 'package:macos_window_utils/window_manipulator.dart';
2423

2524
const _debounceDuration = Duration(milliseconds: 10);

0 commit comments

Comments
 (0)