Skip to content

Commit 9c3dfb5

Browse files
engels-all-win-softwaremvanbeusekom
engels-all-win-software
and
mvanbeusekom
authored
[Feature] Add SPM support (#259)
* feat: add SPM support * chore: update changelog.md * feat: add privacy manifest * feat: update gitignore --------- Co-authored-by: Maurits van Beusekom <[email protected]>
1 parent b8b2e2b commit 9c3dfb5

File tree

17 files changed

+82
-51
lines changed

17 files changed

+82
-51
lines changed

‎geocoding/example/ios/Flutter/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ephemeral

‎geocoding_ios/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 3.1.0
2+
3+
* Adds SPM support
4+
15
## 3.0.2
26

37
* Fixed deprecation warnings.

‎geocoding_ios/example/ios/Flutter/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ephemeral

‎geocoding_ios/example/ios/Flutter/Debug.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
22
#include "Generated.xcconfig"

‎geocoding_ios/example/ios/Flutter/Release.xcconfig

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

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

Lines changed: 22 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11-
3A9CA3FB225058BB3750F6AB /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD9DA91BD653963BFD21153C /* libPods-Runner.a */; };
1211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1313
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1414
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
1515
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -31,12 +31,9 @@
3131
/* End PBXCopyFilesBuildPhase section */
3232

3333
/* Begin PBXFileReference section */
34-
0366168EF001641D77120B1B /* 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 = "<group>"; };
3534
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3635
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3736
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
38-
49DB5868150FE6C83A3256B9 /* 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 = "<group>"; };
39-
4B0CE0B78A7558A4489D1236 /* 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>"; };
4037
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4138
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4239
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -48,15 +45,14 @@
4845
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4946
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5047
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
51-
FD9DA91BD653963BFD21153C /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5248
/* End PBXFileReference section */
5349

5450
/* Begin PBXFrameworksBuildPhase section */
5551
97C146EB1CF9000F007C117D /* Frameworks */ = {
5652
isa = PBXFrameworksBuildPhase;
5753
buildActionMask = 2147483647;
5854
files = (
59-
3A9CA3FB225058BB3750F6AB /* libPods-Runner.a in Frameworks */,
55+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
6056
);
6157
runOnlyForDeploymentPostprocessing = 0;
6258
};
@@ -66,9 +62,6 @@
6662
4F098E1C0BAAC81A66649FD3 /* Pods */ = {
6763
isa = PBXGroup;
6864
children = (
69-
0366168EF001641D77120B1B /* Pods-Runner.debug.xcconfig */,
70-
49DB5868150FE6C83A3256B9 /* Pods-Runner.release.xcconfig */,
71-
4B0CE0B78A7558A4489D1236 /* Pods-Runner.profile.xcconfig */,
7265
);
7366
path = Pods;
7467
sourceTree = "<group>";
@@ -91,7 +84,6 @@
9184
97C146F01CF9000F007C117D /* Runner */,
9285
97C146EF1CF9000F007C117D /* Products */,
9386
4F098E1C0BAAC81A66649FD3 /* Pods */,
94-
BC259BD4ADE742F155776BE6 /* Frameworks */,
9587
);
9688
sourceTree = "<group>";
9789
};
@@ -127,22 +119,13 @@
127119
name = "Supporting Files";
128120
sourceTree = "<group>";
129121
};
130-
BC259BD4ADE742F155776BE6 /* Frameworks */ = {
131-
isa = PBXGroup;
132-
children = (
133-
FD9DA91BD653963BFD21153C /* libPods-Runner.a */,
134-
);
135-
name = Frameworks;
136-
sourceTree = "<group>";
137-
};
138122
/* End PBXGroup section */
139123

140124
/* Begin PBXNativeTarget section */
141125
97C146ED1CF9000F007C117D /* Runner */ = {
142126
isa = PBXNativeTarget;
143127
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
144128
buildPhases = (
145-
8DFC6F9C3CE01544A19E06C6 /* [CP] Check Pods Manifest.lock */,
146129
9740EEB61CF901F6004384FC /* Run Script */,
147130
97C146EA1CF9000F007C117D /* Sources */,
148131
97C146EB1CF9000F007C117D /* Frameworks */,
@@ -156,6 +139,9 @@
156139
dependencies = (
157140
);
158141
name = Runner;
142+
packageProductDependencies = (
143+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
144+
);
159145
productName = Runner;
160146
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
161147
productType = "com.apple.product-type.application";
@@ -183,6 +169,9 @@
183169
Base,
184170
);
185171
mainGroup = 97C146E51CF9000F007C117D;
172+
packageReferences = (
173+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
174+
);
186175
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
187176
projectDirPath = "";
188177
projectRoot = "";
@@ -223,28 +212,6 @@
223212
shellPath = /bin/sh;
224213
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
225214
};
226-
8DFC6F9C3CE01544A19E06C6 /* [CP] Check Pods Manifest.lock */ = {
227-
isa = PBXShellScriptBuildPhase;
228-
buildActionMask = 2147483647;
229-
files = (
230-
);
231-
inputFileListPaths = (
232-
);
233-
inputPaths = (
234-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
235-
"${PODS_ROOT}/Manifest.lock",
236-
);
237-
name = "[CP] Check Pods Manifest.lock";
238-
outputFileListPaths = (
239-
);
240-
outputPaths = (
241-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
242-
);
243-
runOnlyForDeploymentPostprocessing = 0;
244-
shellPath = /bin/sh;
245-
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";
246-
showEnvVarsInLog = 0;
247-
};
248215
9740EEB61CF901F6004384FC /* Run Script */ = {
249216
isa = PBXShellScriptBuildPhase;
250217
alwaysOutOfDate = 1;
@@ -570,6 +537,20 @@
570537
defaultConfigurationName = Release;
571538
};
572539
/* End XCConfigurationList section */
540+
541+
/* Begin XCLocalSwiftPackageReference section */
542+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
543+
isa = XCLocalSwiftPackageReference;
544+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
545+
};
546+
/* End XCLocalSwiftPackageReference section */
547+
548+
/* Begin XCSwiftPackageProductDependency section */
549+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
550+
isa = XCSwiftPackageProductDependency;
551+
productName = FlutterGeneratedPluginSwiftPackage;
552+
};
553+
/* End XCSwiftPackageProductDependency section */
573554
};
574555
rootObject = 97C146E61CF9000F007C117D /* Project object */;
575556
}

‎geocoding_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 18 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"

‎geocoding_ios/ios/geocoding_ios.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ A new flutter plugin project.
1313
s.license = { :file => '../LICENSE' }
1414
s.author = { 'Baseflow' => '[email protected]' }
1515
s.source = { :path => '.' }
16-
s.source_files = 'Classes/**/*'
17-
s.public_header_files = 'Classes/**/*.h'
16+
s.source_files = 'geocoding_ios/Sources/**/*'
17+
s.public_header_files = 'geocoding_ios/Sources/**/*.h'
1818
s.dependency 'Flutter'
1919
s.platform = :ios, '8.0'
2020

2121
# Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
2222
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
23-
s.resource_bundles = {'geocoding_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
23+
s.resource_bundles = {'geocoding_ios_privacy' => ['geocoding_ios/Sources/PrivacyInfo.xcprivacy']}
2424
end

‎geocoding_ios/ios/geocoding_ios/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.build

‎geocoding_ios/ios/geocoding_ios/Package.swift

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// swift-tools-version: 5.9
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "geocoding_ios",
7+
platforms: [
8+
.iOS("12.0")
9+
],
10+
products: [
11+
.library(name: "geocoding-ios", targets: ["geocoding_ios"])
12+
],
13+
targets: [
14+
.target(
15+
name: "geocoding_ios",
16+
resources: [
17+
.process("PrivacyInfo.xcprivacy"),
18+
],
19+
cSettings: [
20+
// TODO: Update your plugin name.
21+
.headerSearchPath("include/geocoding_ios")
22+
]
23+
)
24+
]
25+
)

0 commit comments

Comments
 (0)