Skip to content

Commit 99a39e3

Browse files
engels-all-win-softwareengels-all-win-software
committed
feat: add SPM support
1 parent 3d0dd89 commit 99a39e3

File tree

18 files changed

+92
-65
lines changed

18 files changed

+92
-65
lines changed

‎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: 30 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
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 */,
@@ -155,6 +138,9 @@
155138
dependencies = (
156139
);
157140
name = Runner;
141+
packageProductDependencies = (
142+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
143+
);
158144
productName = Runner;
159145
productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
160146
productType = "com.apple.product-type.application";
@@ -165,7 +151,7 @@
165151
97C146E61CF9000F007C117D /* Project object */ = {
166152
isa = PBXProject;
167153
attributes = {
168-
LastUpgradeCheck = 1020;
154+
LastUpgradeCheck = 1510;
169155
ORGANIZATIONNAME = "";
170156
TargetAttributes = {
171157
97C146ED1CF9000F007C117D = {
@@ -182,6 +168,9 @@
182168
Base,
183169
);
184170
mainGroup = 97C146E51CF9000F007C117D;
171+
packageReferences = (
172+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
173+
);
185174
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
186175
projectDirPath = "";
187176
projectRoot = "";
@@ -208,10 +197,12 @@
208197
/* Begin PBXShellScriptBuildPhase section */
209198
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
210199
isa = PBXShellScriptBuildPhase;
200+
alwaysOutOfDate = 1;
211201
buildActionMask = 2147483647;
212202
files = (
213203
);
214204
inputPaths = (
205+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
215206
);
216207
name = "Thin Binary";
217208
outputPaths = (
@@ -220,30 +211,9 @@
220211
shellPath = /bin/sh;
221212
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
222213
};
223-
8DFC6F9C3CE01544A19E06C6 /* [CP] Check Pods Manifest.lock */ = {
224-
isa = PBXShellScriptBuildPhase;
225-
buildActionMask = 2147483647;
226-
files = (
227-
);
228-
inputFileListPaths = (
229-
);
230-
inputPaths = (
231-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
232-
"${PODS_ROOT}/Manifest.lock",
233-
);
234-
name = "[CP] Check Pods Manifest.lock";
235-
outputFileListPaths = (
236-
);
237-
outputPaths = (
238-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
239-
);
240-
runOnlyForDeploymentPostprocessing = 0;
241-
shellPath = /bin/sh;
242-
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";
243-
showEnvVarsInLog = 0;
244-
};
245214
9740EEB61CF901F6004384FC /* Run Script */ = {
246215
isa = PBXShellScriptBuildPhase;
216+
alwaysOutOfDate = 1;
247217
buildActionMask = 2147483647;
248218
files = (
249219
);
@@ -332,7 +302,7 @@
332302
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
333303
GCC_WARN_UNUSED_FUNCTION = YES;
334304
GCC_WARN_UNUSED_VARIABLE = YES;
335-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
305+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
336306
MTL_ENABLE_DEBUG_INFO = NO;
337307
SDKROOT = iphoneos;
338308
SUPPORTED_PLATFORMS = iphoneos;
@@ -414,7 +384,7 @@
414384
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
415385
GCC_WARN_UNUSED_FUNCTION = YES;
416386
GCC_WARN_UNUSED_VARIABLE = YES;
417-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
387+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
418388
MTL_ENABLE_DEBUG_INFO = YES;
419389
ONLY_ACTIVE_ARCH = YES;
420390
SDKROOT = iphoneos;
@@ -463,7 +433,7 @@
463433
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
464434
GCC_WARN_UNUSED_FUNCTION = YES;
465435
GCC_WARN_UNUSED_VARIABLE = YES;
466-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
436+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
467437
MTL_ENABLE_DEBUG_INFO = NO;
468438
SDKROOT = iphoneos;
469439
SUPPORTED_PLATFORMS = iphoneos;
@@ -549,6 +519,20 @@
549519
defaultConfigurationName = Release;
550520
};
551521
/* End XCConfigurationList section */
522+
523+
/* Begin XCLocalSwiftPackageReference section */
524+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
525+
isa = XCLocalSwiftPackageReference;
526+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
527+
};
528+
/* End XCLocalSwiftPackageReference section */
529+
530+
/* Begin XCSwiftPackageProductDependency section */
531+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
532+
isa = XCSwiftPackageProductDependency;
533+
productName = FlutterGeneratedPluginSwiftPackage;
534+
};
535+
/* End XCSwiftPackageProductDependency section */
552536
};
553537
rootObject = 97C146E61CF9000F007C117D /* Project object */;
554538
}

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
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/example/lib/main.dart‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class BaseflowPluginExample extends StatelessWidget {
1313
createMaterialColor(const Color.fromRGBO(48, 49, 60, 1));
1414

1515
/// Constructs the [BaseflowPluginExample] class
16-
BaseflowPluginExample({Key? key}) : super(key: key);
16+
BaseflowPluginExample({super.key});
1717

1818
@override
1919
Widget build(BuildContext context) {
@@ -68,28 +68,29 @@ class BaseflowPluginExample extends StatelessWidget {
6868
static MaterialColor createMaterialColor(Color color) {
6969
final strengths = <double>[.05];
7070
final swatch = <int, Color>{};
71-
final r = color.red, g = color.green, b = color.blue;
71+
final r = color.r, g = color.g, b = color.b;
7272

7373
for (var i = 1; i < 10; i++) {
7474
strengths.add(0.1 * i);
7575
}
7676
for (var strength in strengths) {
7777
final ds = 0.5 - strength;
7878
swatch[(strength * 1000).round()] = Color.fromRGBO(
79-
r + ((ds < 0 ? r : (255 - r)) * ds).round(),
80-
g + ((ds < 0 ? g : (255 - g)) * ds).round(),
81-
b + ((ds < 0 ? b : (255 - b)) * ds).round(),
79+
(r + ((ds < 0 ? r : (255 - r)) * ds)).round(),
80+
(g + ((ds < 0 ? g : (255 - g)) * ds)).round(),
81+
(b + ((ds < 0 ? b : (255 - b)) * ds)).round(),
8282
1,
8383
);
8484
}
85+
// ignore: deprecated_member_use
8586
return MaterialColor(color.value, swatch);
8687
}
8788
}
8889

8990
/// A Flutter example demonstrating how the [pluginName] plugin could be used
9091
class AppHome extends StatefulWidget {
9192
/// Constructs the [AppHome] class
92-
const AppHome({Key? key, required this.title}) : super(key: key);
93+
const AppHome({super.key, required this.title});
9394

9495
/// The [title] of the application, which is shown in the application's
9596
/// title bar.

‎geocoding_ios/example/lib/plugin_example/geocode_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import '../template/globals.dart';
66
/// Example [Widget] showing the use of the Geocode plugin
77
class GeocodeWidget extends StatefulWidget {
88
/// Constructs the [GeocodeWidget] class
9-
const GeocodeWidget({Key? key}) : super(key: key);
9+
const GeocodeWidget({super.key});
1010

1111
@override
1212
State<GeocodeWidget> createState() => _GeocodeWidgetState();

‎geocoding_ios/example/lib/template/info_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'globals.dart';
66
/// [StatelessWidget] displaying information about Baseflow
77
class InfoPage extends StatelessWidget {
88
/// Constructs the [InfoPage] class
9-
const InfoPage({Key? key}) : super(key: key);
9+
const InfoPage({super.key});
1010

1111
@override
1212
Widget build(BuildContext context) {

‎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

0 commit comments

Comments
 (0)