diff --git a/packages/desktop_multi_window/CHANGELOG.md b/packages/desktop_multi_window/CHANGELOG.md index 27bbd181..20c7fa81 100644 --- a/packages/desktop_multi_window/CHANGELOG.md +++ b/packages/desktop_multi_window/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.1 + +* Add Swift Package Manager support for macOS. + ## 0.3.0 * [BREAK CHANGE] rewritten, please refer to readme diff --git a/packages/desktop_multi_window/example/macos/Podfile.lock b/packages/desktop_multi_window/example/macos/Podfile.lock index 18af70eb..0416d810 100644 --- a/packages/desktop_multi_window/example/macos/Podfile.lock +++ b/packages/desktop_multi_window/example/macos/Podfile.lock @@ -1,8 +1,6 @@ PODS: - desktop_lifecycle (0.0.1): - FlutterMacOS - - desktop_multi_window (0.0.1): - - FlutterMacOS - FlutterMacOS (1.0.0) - fvp (0.35.0): - Flutter @@ -11,27 +9,15 @@ PODS: - mdk (0.35.0) - mixin_logger (0.0.1): - FlutterMacOS - - path_provider_foundation (0.0.1): - - Flutter - - FlutterMacOS - screen_retriever_macos (0.0.1): - FlutterMacOS - - video_player_avfoundation (0.0.1): - - Flutter - - FlutterMacOS - - window_manager (0.5.0): - - FlutterMacOS DEPENDENCIES: - desktop_lifecycle (from `Flutter/ephemeral/.symlinks/plugins/desktop_lifecycle/macos`) - - desktop_multi_window (from `Flutter/ephemeral/.symlinks/plugins/desktop_multi_window/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - fvp (from `Flutter/ephemeral/.symlinks/plugins/fvp/darwin`) - mixin_logger (from `Flutter/ephemeral/.symlinks/plugins/mixin_logger/macos`) - - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`) - - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`) - - window_manager (from `Flutter/ephemeral/.symlinks/plugins/window_manager/macos`) SPEC REPOS: trunk: @@ -40,34 +26,22 @@ SPEC REPOS: EXTERNAL SOURCES: desktop_lifecycle: :path: Flutter/ephemeral/.symlinks/plugins/desktop_lifecycle/macos - desktop_multi_window: - :path: Flutter/ephemeral/.symlinks/plugins/desktop_multi_window/macos FlutterMacOS: :path: Flutter/ephemeral fvp: :path: Flutter/ephemeral/.symlinks/plugins/fvp/darwin mixin_logger: :path: Flutter/ephemeral/.symlinks/plugins/mixin_logger/macos - path_provider_foundation: - :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin screen_retriever_macos: :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos - video_player_avfoundation: - :path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin - window_manager: - :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos SPEC CHECKSUMS: - desktop_lifecycle: e4d2ff93af77bbbd473fe1a61773fdf9c5a79c91 - desktop_multi_window: 93667594ccc4b88d91a97972fd3b1b89667fa80a - FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - fvp: ecee65308dd86ae46e3c6d5d42cd2aad48095ef5 + desktop_lifecycle: a600c10e12fe033c7be9078f2e929b8241f2c1e3 + FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 + fvp: f4fdb89279e863eb09869bde7ba7fce9e81a16ab mdk: baa616b93f696c7066df0e5ebe057badfa9c462b - mixin_logger: 6b31328b08f546a8defd32cd910370562fc48405 - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 - screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f - video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b - window_manager: b729e31d38fb04905235df9ea896128991cad99e + mixin_logger: 5e5bd35ba38da1ff4939ee5ec83260d7fc5258fc + screen_retriever_macos: 776e0fa5d42c6163d2bf772d22478df4b302b161 PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0 diff --git a/packages/desktop_multi_window/example/macos/Runner.xcodeproj/project.pbxproj b/packages/desktop_multi_window/example/macos/Runner.xcodeproj/project.pbxproj index f3aa2661..8c23951e 100644 --- a/packages/desktop_multi_window/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/desktop_multi_window/example/macos/Runner.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; CC0B098B211E0948E46E62C0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39921C44D639FF2E70CBEF5B /* Pods_Runner.framework */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -73,6 +74,9 @@ AF3A64458E98D8652057B601 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; DEA6C9E202FDF3F66F4C21C0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; EE8DF618EDF6B1F6380EB9FE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; + 784666492D4C4C64000A1A5F /* FlutterFramework */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterFramework; path = ephemeral/Packages/.packages/FlutterFramework; sourceTree = ""; }; + 78DABEA22ED26510000E7860 /* desktop_multi_window */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = desktop_multi_window; path = ../../../macos/desktop_multi_window; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,6 +84,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, CC0B098B211E0948E46E62C0 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -131,6 +136,9 @@ 33CEB47122A05771004F2AC0 /* Flutter */ = { isa = PBXGroup; children = ( + 78DABEA22ED26510000E7860 /* desktop_multi_window */, + 784666492D4C4C64000A1A5F /* FlutterFramework */, + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, @@ -175,6 +183,9 @@ /* Begin PBXNativeTarget section */ 33CC10EC2044A3C60003C045 /* Runner */ = { + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); isa = PBXNativeTarget; buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( @@ -200,6 +211,9 @@ /* Begin PBXProject section */ 33CC10E52044A3C60003C045 /* Project object */ = { + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; @@ -628,6 +642,18 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; } diff --git a/packages/desktop_multi_window/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/desktop_multi_window/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index afc8b4a1..19b77e55 100644 --- a/packages/desktop_multi_window/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/desktop_multi_window/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + '../LICENSE' } s.author = { 'Your Company' => 'email@example.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source_files = 'desktop_multi_window/Sources/desktop_multi_window/**/*' s.dependency 'FlutterMacOS' s.platform = :osx, '10.11' diff --git a/packages/desktop_multi_window/macos/desktop_multi_window/Package.swift b/packages/desktop_multi_window/macos/desktop_multi_window/Package.swift new file mode 100644 index 00000000..90e538b4 --- /dev/null +++ b/packages/desktop_multi_window/macos/desktop_multi_window/Package.swift @@ -0,0 +1,18 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "desktop_multi_window", + platforms: [ + .macOS("10.11") + ], + products: [ + .library(name: "desktop-multi-window", targets: ["desktop_multi_window"]) + ], + dependencies: [], + targets: [ + .target( + name: "desktop_multi_window" + ) + ] +) diff --git a/packages/desktop_multi_window/macos/Classes/FlutterMultiWindowPlugin.swift b/packages/desktop_multi_window/macos/desktop_multi_window/Sources/desktop_multi_window/FlutterMultiWindowPlugin.swift similarity index 100% rename from packages/desktop_multi_window/macos/Classes/FlutterMultiWindowPlugin.swift rename to packages/desktop_multi_window/macos/desktop_multi_window/Sources/desktop_multi_window/FlutterMultiWindowPlugin.swift diff --git a/packages/desktop_multi_window/macos/Classes/FlutterWindow.swift b/packages/desktop_multi_window/macos/desktop_multi_window/Sources/desktop_multi_window/FlutterWindow.swift similarity index 100% rename from packages/desktop_multi_window/macos/Classes/FlutterWindow.swift rename to packages/desktop_multi_window/macos/desktop_multi_window/Sources/desktop_multi_window/FlutterWindow.swift diff --git a/packages/desktop_multi_window/macos/Classes/WindowChannel.swift b/packages/desktop_multi_window/macos/desktop_multi_window/Sources/desktop_multi_window/WindowChannel.swift similarity index 100% rename from packages/desktop_multi_window/macos/Classes/WindowChannel.swift rename to packages/desktop_multi_window/macos/desktop_multi_window/Sources/desktop_multi_window/WindowChannel.swift diff --git a/packages/desktop_multi_window/macos/Classes/WindowConfiguration.swift b/packages/desktop_multi_window/macos/desktop_multi_window/Sources/desktop_multi_window/WindowConfiguration.swift similarity index 100% rename from packages/desktop_multi_window/macos/Classes/WindowConfiguration.swift rename to packages/desktop_multi_window/macos/desktop_multi_window/Sources/desktop_multi_window/WindowConfiguration.swift diff --git a/packages/desktop_multi_window/pubspec.yaml b/packages/desktop_multi_window/pubspec.yaml index 011ea7f4..bddc87b6 100644 --- a/packages/desktop_multi_window/pubspec.yaml +++ b/packages/desktop_multi_window/pubspec.yaml @@ -1,7 +1,7 @@ name: desktop_multi_window resolution: workspace description: A flutter plugin that create and manager multi window in desktop. -version: 0.3.0 +version: 0.3.1 homepage: https://github.com/MixinNetwork/flutter-plugins/tree/main/packages/desktop_multi_window environment: