Skip to content

Commit bd86481

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

74 files changed

Lines changed: 346 additions & 390 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.

‎README.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,8 @@ This will prevent issues like [#131](https://github.com/PhilipsHue/flutter_react
7070
### iOS / MacOS
7171

7272
For iOS/MacOS it is required you add the following entries to the `Info.plist` file of your app. It is not allowed to access Core BLuetooth without this. See [our example app](https://github.com/PhilipsHue/flutter_reactive_ble/blob/master/example/ios/Runner/Info.plist) on how to implement this. For more indepth details: [Blog post on iOS bluetooth permissions](https://medium.com/flawless-app-stories/handling-ios-13-bluetooth-permissions-26c6a8cbb816)
73-
74-
iOS13 and higher
7573
* NSBluetoothAlwaysUsageDescription
7674

77-
iOS12 and lower
78-
* NSBluetoothPeripheralUsageDescription
79-
8075
For MacOS, make sure to enable Bluetooth from Capabilities
8176

8277
## Usage

‎example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,5 @@
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
23-
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
2523
</dict>
2624
</plist>

‎example/ios/Flutter/Debug.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
21
#include "Generated.xcconfig"
32

43
// See https://github.com/flutter/flutter/issues/17735#issuecomment-400837152

‎example/ios/Flutter/Release.xcconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
21
#include "Generated.xcconfig"

‎example/ios/Podfile‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎example/ios/Podfile.lock‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 26 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
4420061D1A9C37B8A0AB65BE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DC939A6C6230516B6561DA7 /* Pods_Runner.framework */; };
1312
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
13+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1414
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1515
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1616
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -32,28 +32,26 @@
3232
/* Begin PBXFileReference section */
3333
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3434
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
35-
2DC939A6C6230516B6561DA7 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3635
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
3736
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
3837
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
38+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
3939
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
40-
7EBC76C216EA0AABB2DE9E05 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4140
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4241
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4342
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
4443
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4544
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4645
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4746
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
48-
A1AB08F7B02CE763EEA8E83F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4947
/* End PBXFileReference section */
5048

5149
/* Begin PBXFrameworksBuildPhase section */
5250
97C146EB1CF9000F007C117D /* Frameworks */ = {
5351
isa = PBXFrameworksBuildPhase;
5452
buildActionMask = 2147483647;
5553
files = (
56-
4420061D1A9C37B8A0AB65BE /* Pods_Runner.framework in Frameworks */,
54+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
5755
);
5856
runOnlyForDeploymentPostprocessing = 0;
5957
};
@@ -63,6 +61,7 @@
6361
9740EEB11CF90186004384FC /* Flutter */ = {
6462
isa = PBXGroup;
6563
children = (
64+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
6665
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
6766
9740EEB21CF90195004384FC /* Debug.xcconfig */,
6867
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -77,8 +76,6 @@
7776
9740EEB11CF90186004384FC /* Flutter */,
7877
97C146F01CF9000F007C117D /* Runner */,
7978
97C146EF1CF9000F007C117D /* Products */,
80-
B49FCFD9D4B2372E34D7801B /* Frameworks */,
81-
CF3BE155C9818468E21B3004 /* Pods */,
8279
);
8380
sourceTree = "<group>";
8481
};
@@ -113,44 +110,28 @@
113110
name = "Supporting Files";
114111
sourceTree = "<group>";
115112
};
116-
B49FCFD9D4B2372E34D7801B /* Frameworks */ = {
117-
isa = PBXGroup;
118-
children = (
119-
2DC939A6C6230516B6561DA7 /* Pods_Runner.framework */,
120-
);
121-
name = Frameworks;
122-
sourceTree = "<group>";
123-
};
124-
CF3BE155C9818468E21B3004 /* Pods */ = {
125-
isa = PBXGroup;
126-
children = (
127-
A1AB08F7B02CE763EEA8E83F /* Pods-Runner.debug.xcconfig */,
128-
7EBC76C216EA0AABB2DE9E05 /* Pods-Runner.release.xcconfig */,
129-
);
130-
name = Pods;
131-
sourceTree = "<group>";
132-
};
133113
/* End PBXGroup section */
134114

135115
/* Begin PBXNativeTarget section */
136116
97C146ED1CF9000F007C117D /* Runner */ = {
137117
isa = PBXNativeTarget;
138118
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
139119
buildPhases = (
140-
D0CFD4CA16102FC98AEF7532 /* [CP] Check Pods Manifest.lock */,
141120
9740EEB61CF901F6004384FC /* Run Script */,
142121
97C146EA1CF9000F007C117D /* Sources */,
143122
97C146EB1CF9000F007C117D /* Frameworks */,
144123
97C146EC1CF9000F007C117D /* Resources */,
145124
9705A1C41CF9048500538489 /* Embed Frameworks */,
146125
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
147-
D72A0CA9D36EA43BDDD3A1FC /* [CP] Embed Pods Frameworks */,
148126
);
149127
buildRules = (
150128
);
151129
dependencies = (
152130
);
153131
name = Runner;
132+
packageProductDependencies = (
133+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
134+
);
154135
productName = Runner;
155136
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
156137
productType = "com.apple.product-type.application";
@@ -181,6 +162,9 @@
181162
Base,
182163
);
183164
mainGroup = 97C146E51CF9000F007C117D;
165+
packageReferences = (
166+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
167+
);
184168
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
185169
projectDirPath = "";
186170
projectRoot = "";
@@ -236,50 +220,6 @@
236220
shellPath = /bin/sh;
237221
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
238222
};
239-
D0CFD4CA16102FC98AEF7532 /* [CP] Check Pods Manifest.lock */ = {
240-
isa = PBXShellScriptBuildPhase;
241-
buildActionMask = 2147483647;
242-
files = (
243-
);
244-
inputFileListPaths = (
245-
);
246-
inputPaths = (
247-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
248-
"${PODS_ROOT}/Manifest.lock",
249-
);
250-
name = "[CP] Check Pods Manifest.lock";
251-
outputFileListPaths = (
252-
);
253-
outputPaths = (
254-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
255-
);
256-
runOnlyForDeploymentPostprocessing = 0;
257-
shellPath = /bin/sh;
258-
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";
259-
showEnvVarsInLog = 0;
260-
};
261-
D72A0CA9D36EA43BDDD3A1FC /* [CP] Embed Pods Frameworks */ = {
262-
isa = PBXShellScriptBuildPhase;
263-
buildActionMask = 2147483647;
264-
files = (
265-
);
266-
inputPaths = (
267-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
268-
"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
269-
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
270-
"${BUILT_PRODUCTS_DIR}/reactive_ble_mobile/reactive_ble_mobile.framework",
271-
);
272-
name = "[CP] Embed Pods Frameworks";
273-
outputPaths = (
274-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
275-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
276-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/reactive_ble_mobile.framework",
277-
);
278-
runOnlyForDeploymentPostprocessing = 0;
279-
shellPath = /bin/sh;
280-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
281-
showEnvVarsInLog = 0;
282-
};
283223
/* End PBXShellScriptBuildPhase section */
284224

285225
/* Begin PBXSourcesBuildPhase section */
@@ -361,7 +301,7 @@
361301
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
362302
GCC_WARN_UNUSED_FUNCTION = YES;
363303
GCC_WARN_UNUSED_VARIABLE = YES;
364-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
304+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
365305
MTL_ENABLE_DEBUG_INFO = YES;
366306
ONLY_ACTIVE_ARCH = YES;
367307
SDKROOT = iphoneos;
@@ -411,7 +351,7 @@
411351
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
412352
GCC_WARN_UNUSED_FUNCTION = YES;
413353
GCC_WARN_UNUSED_VARIABLE = YES;
414-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
354+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
415355
MTL_ENABLE_DEBUG_INFO = NO;
416356
SDKROOT = iphoneos;
417357
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -502,6 +442,20 @@
502442
defaultConfigurationName = Release;
503443
};
504444
/* End XCConfigurationList section */
445+
446+
/* Begin XCLocalSwiftPackageReference section */
447+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
448+
isa = XCLocalSwiftPackageReference;
449+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
450+
};
451+
/* End XCLocalSwiftPackageReference section */
452+
453+
/* Begin XCSwiftPackageProductDependency section */
454+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
455+
isa = XCSwiftPackageProductDependency;
456+
productName = FlutterGeneratedPluginSwiftPackage;
457+
};
458+
/* End XCSwiftPackageProductDependency section */
505459
};
506460
rootObject = 97C146E61CF9000F007C117D /* Project object */;
507461
}

‎example/ios/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/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 21 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 = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
14+
<EnvironmentBuildable>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
18+
BuildableName = "Runner.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"
@@ -26,6 +44,7 @@
2644
buildConfiguration = "Debug"
2745
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2846
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2948
shouldUseLaunchSchemeArgsEnv = "YES">
3049
<Testables>
3150
</Testables>
@@ -45,11 +64,13 @@
4564
buildConfiguration = "Debug"
4665
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4766
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
67+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4868
launchStyle = "0"
4969
useCustomWorkingDirectory = "NO"
5070
ignoresPersistentStateOnLaunch = "NO"
5171
debugDocumentVersioning = "YES"
5272
debugServiceExtension = "internal"
73+
enableGPUValidationMode = "1"
5374
allowLocationSimulation = "YES">
5475
<BuildableProductRunnable
5576
runnableDebuggingMode = "0">

‎example/ios/Runner.xcworkspace/contents.xcworkspacedata‎

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

0 commit comments

Comments
 (0)