Skip to content

Commit ed7e097

Browse files
author
Rutger Vromans
committed
Perform SPM migration
1 parent 9c57d4e commit ed7e097

51 files changed

Lines changed: 123 additions & 70 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎example/macos/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.14'
1+
platform :osx, '10.15'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎example/macos/Podfile.lock‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,16 @@
11
PODS:
22
- FlutterMacOS (1.0.0)
3-
- Protobuf (3.24.3)
4-
- reactive_ble_mobile (0.0.1):
5-
- Flutter
6-
- FlutterMacOS
7-
- Protobuf (~> 3.5)
8-
- SwiftProtobuf (~> 1.0)
9-
- SwiftProtobuf (1.23.0)
103

114
DEPENDENCIES:
125
- FlutterMacOS (from `Flutter/ephemeral`)
13-
- reactive_ble_mobile (from `Flutter/ephemeral/.symlinks/plugins/reactive_ble_mobile/darwin`)
14-
15-
SPEC REPOS:
16-
trunk:
17-
- Protobuf
18-
- SwiftProtobuf
196

207
EXTERNAL SOURCES:
218
FlutterMacOS:
229
:path: Flutter/ephemeral
23-
reactive_ble_mobile:
24-
:path: Flutter/ephemeral/.symlinks/plugins/reactive_ble_mobile/darwin
2510

2611
SPEC CHECKSUMS:
27-
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
28-
Protobuf: 970f7ee93a3a08e3cf64859b8efd95ee32b4f87f
29-
reactive_ble_mobile: 856183aeda09f2a676bbaecbea8915c3cb1d33df
30-
SwiftProtobuf: b70d65f419fbfe61a2d58003456ca5da58e337d6
12+
FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
3113

32-
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
14+
PODFILE CHECKSUM: 9ebaf0ce3d369aaa26a9ea0e159195ed94724cf3
3315

34-
COCOAPODS: 1.15.2
16+
COCOAPODS: 1.16.2

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

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
2929
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
3030
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
31+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
3132
904E48124469FBC322F27D5A /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85B8C902C0757A9CA7D36A84 /* Pods_RunnerTests.framework */; };
3233
/* End PBXBuildFile section */
3334

@@ -82,6 +83,7 @@
8283
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
8384
470148CB6AB5682D399B2432 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
8485
69D2AB5CC148AC63C87363EC /* 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 = "<group>"; };
86+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
8587
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
8688
82134745585B8AC665871654 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
8789
85B8C902C0757A9CA7D36A84 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -103,6 +105,7 @@
103105
isa = PBXFrameworksBuildPhase;
104106
buildActionMask = 2147483647;
105107
files = (
108+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
106109
0F4D11E09ACCE2E29E24AD42 /* Pods_Runner.framework in Frameworks */,
107110
);
108111
runOnlyForDeploymentPostprocessing = 0;
@@ -164,6 +167,7 @@
164167
33CEB47122A05771004F2AC0 /* Flutter */ = {
165168
isa = PBXGroup;
166169
children = (
170+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
167171
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */,
168172
33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
169173
33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
@@ -239,14 +243,16 @@
239243
33CC10EB2044A3C60003C045 /* Resources */,
240244
33CC110E2044A8840003C045 /* Bundle Framework */,
241245
3399D490228B24CF009A79C7 /* ShellScript */,
242-
E280CFD7251EFE09C0FE5BD2 /* [CP] Embed Pods Frameworks */,
243246
);
244247
buildRules = (
245248
);
246249
dependencies = (
247250
33CC11202044C79F0003C045 /* PBXTargetDependency */,
248251
);
249252
name = Runner;
253+
packageProductDependencies = (
254+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
255+
);
250256
productName = Runner;
251257
productReference = 33CC10ED2044A3C60003C045 /* example.app */;
252258
productType = "com.apple.product-type.application";
@@ -290,6 +296,9 @@
290296
Base,
291297
);
292298
mainGroup = 33CC10E42044A3C60003C045;
299+
packageReferences = (
300+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
301+
);
293302
productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
294303
projectDirPath = "";
295304
projectRoot = "";
@@ -403,23 +412,6 @@
403412
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
404413
showEnvVarsInLog = 0;
405414
};
406-
E280CFD7251EFE09C0FE5BD2 /* [CP] Embed Pods Frameworks */ = {
407-
isa = PBXShellScriptBuildPhase;
408-
buildActionMask = 2147483647;
409-
files = (
410-
);
411-
inputFileListPaths = (
412-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
413-
);
414-
name = "[CP] Embed Pods Frameworks";
415-
outputFileListPaths = (
416-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
417-
);
418-
runOnlyForDeploymentPostprocessing = 0;
419-
shellPath = /bin/sh;
420-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
421-
showEnvVarsInLog = 0;
422-
};
423415
/* End PBXShellScriptBuildPhase section */
424416

425417
/* Begin PBXSourcesBuildPhase section */
@@ -552,7 +544,7 @@
552544
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
553545
GCC_WARN_UNUSED_FUNCTION = YES;
554546
GCC_WARN_UNUSED_VARIABLE = YES;
555-
MACOSX_DEPLOYMENT_TARGET = 10.14;
547+
MACOSX_DEPLOYMENT_TARGET = 10.15;
556548
MTL_ENABLE_DEBUG_INFO = NO;
557549
SDKROOT = macosx;
558550
SWIFT_COMPILATION_MODE = wholemodule;
@@ -632,7 +624,7 @@
632624
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
633625
GCC_WARN_UNUSED_FUNCTION = YES;
634626
GCC_WARN_UNUSED_VARIABLE = YES;
635-
MACOSX_DEPLOYMENT_TARGET = 10.14;
627+
MACOSX_DEPLOYMENT_TARGET = 10.15;
636628
MTL_ENABLE_DEBUG_INFO = YES;
637629
ONLY_ACTIVE_ARCH = YES;
638630
SDKROOT = macosx;
@@ -679,7 +671,7 @@
679671
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
680672
GCC_WARN_UNUSED_FUNCTION = YES;
681673
GCC_WARN_UNUSED_VARIABLE = YES;
682-
MACOSX_DEPLOYMENT_TARGET = 10.14;
674+
MACOSX_DEPLOYMENT_TARGET = 10.15;
683675
MTL_ENABLE_DEBUG_INFO = NO;
684676
SDKROOT = macosx;
685677
SWIFT_COMPILATION_MODE = wholemodule;
@@ -788,6 +780,20 @@
788780
defaultConfigurationName = Release;
789781
};
790782
/* End XCConfigurationList section */
783+
784+
/* Begin XCLocalSwiftPackageReference section */
785+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
786+
isa = XCLocalSwiftPackageReference;
787+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
788+
};
789+
/* End XCLocalSwiftPackageReference section */
790+
791+
/* Begin XCSwiftPackageProductDependency section */
792+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
793+
isa = XCSwiftPackageProductDependency;
794+
productName = FlutterGeneratedPluginSwiftPackage;
795+
};
796+
/* End XCSwiftPackageProductDependency section */
791797
};
792798
rootObject = 33CC10E52044A3C60003C045 /* Project object */;
793799
}

‎example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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"
@@ -59,6 +77,7 @@
5977
ignoresPersistentStateOnLaunch = "NO"
6078
debugDocumentVersioning = "YES"
6179
debugServiceExtension = "internal"
80+
enableGPUValidationMode = "1"
6281
allowLocationSimulation = "YES">
6382
<BuildableProductRunnable
6483
runnableDebuggingMode = "0">

‎example/macos/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/macos/Runner/AppDelegate.swift‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true
88
}
9+
10+
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
11+
return true
12+
}
913
}

‎example/pubspec.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ packages:
464464
path: "../packages/reactive_ble_mobile"
465465
relative: true
466466
source: path
467-
version: "5.4.2"
467+
version: "5.5.0"
468468
reactive_ble_platform_interface:
469469
dependency: "direct overridden"
470470
description:

‎packages/reactive_ble_mobile/darwin/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ DerivedData/
1111
build/
1212
GeneratedPluginRegistrant.h
1313
GeneratedPluginRegistrant.m
14+
.build/
15+
.swiftpm/
1416

1517
.generated/
1618

‎packages/reactive_ble_mobile/darwin/Assets/.gitkeep‎

Whitespace-only changes.

0 commit comments

Comments
 (0)