From 99a39e35bb489458d0e3734e90d2e477df8ff977 Mon Sep 17 00:00:00 2001 From: Engels Tercero Date: Tue, 4 Feb 2025 09:01:25 -0600 Subject: [PATCH 1/3] feat: add SPM support --- geocoding_ios/example/ios/Flutter/.gitignore | 1 + .../example/ios/Flutter/Debug.xcconfig | 2 +- .../example/ios/Flutter/Release.xcconfig | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 76 ++++++++----------- .../xcshareddata/xcschemes/Runner.xcscheme | 20 ++++- geocoding_ios/example/lib/main.dart | 13 ++-- .../lib/plugin_example/geocode_page.dart | 2 +- .../example/lib/template/info_page.dart | 2 +- geocoding_ios/ios/geocoding_ios.podspec | 6 +- geocoding_ios/ios/geocoding_ios/.gitignore | 1 + geocoding_ios/ios/geocoding_ios/Package.swift | 22 ++++++ .../Sources/geocoding_ios}/GeocodingHandler.m | 2 +- .../Sources/geocoding_ios}/GeocodingPlugin.m | 6 +- .../geocoding_ios}/PrivacyInfo.xcprivacy | 0 .../extensions}/CLPlacemarkExtensions.m | 2 +- .../geocoding_ios}/CLPlacemarkExtensions.h | 0 .../include/geocoding_ios}/GeocodingHandler.h | 0 .../include/geocoding_ios}/GeocodingPlugin.h | 0 18 files changed, 92 insertions(+), 65 deletions(-) create mode 100644 geocoding_ios/example/ios/Flutter/.gitignore create mode 100644 geocoding_ios/ios/geocoding_ios/.gitignore create mode 100644 geocoding_ios/ios/geocoding_ios/Package.swift rename geocoding_ios/ios/{Classes => geocoding_ios/Sources/geocoding_ios}/GeocodingHandler.m (98%) rename geocoding_ios/ios/{Classes => geocoding_ios/Sources/geocoding_ios}/GeocodingPlugin.m (95%) rename geocoding_ios/ios/{Resources => geocoding_ios/Sources/geocoding_ios}/PrivacyInfo.xcprivacy (100%) rename geocoding_ios/ios/{Classes/Extensions => geocoding_ios/Sources/geocoding_ios/extensions}/CLPlacemarkExtensions.m (97%) rename geocoding_ios/ios/{Classes/Extensions => geocoding_ios/Sources/geocoding_ios/include/geocoding_ios}/CLPlacemarkExtensions.h (100%) rename geocoding_ios/ios/{Classes => geocoding_ios/Sources/geocoding_ios/include/geocoding_ios}/GeocodingHandler.h (100%) rename geocoding_ios/ios/{Classes => geocoding_ios/Sources/geocoding_ios/include/geocoding_ios}/GeocodingPlugin.h (100%) diff --git a/geocoding_ios/example/ios/Flutter/.gitignore b/geocoding_ios/example/ios/Flutter/.gitignore new file mode 100644 index 0000000..4f2f7ea --- /dev/null +++ b/geocoding_ios/example/ios/Flutter/.gitignore @@ -0,0 +1 @@ +ephemeral/ diff --git a/geocoding_ios/example/ios/Flutter/Debug.xcconfig b/geocoding_ios/example/ios/Flutter/Debug.xcconfig index e8efba1..ec97fc6 100644 --- a/geocoding_ios/example/ios/Flutter/Debug.xcconfig +++ b/geocoding_ios/example/ios/Flutter/Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/geocoding_ios/example/ios/Flutter/Release.xcconfig b/geocoding_ios/example/ios/Flutter/Release.xcconfig index 399e934..c4855bf 100644 --- a/geocoding_ios/example/ios/Flutter/Release.xcconfig +++ b/geocoding_ios/example/ios/Flutter/Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/geocoding_ios/example/ios/Runner.xcodeproj/project.pbxproj b/geocoding_ios/example/ios/Runner.xcodeproj/project.pbxproj index 70d7845..3cabedd 100644 --- a/geocoding_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/geocoding_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,13 +3,13 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 3A9CA3FB225058BB3750F6AB /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD9DA91BD653963BFD21153C /* libPods-Runner.a */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -31,12 +31,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 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 = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 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 = ""; }; - 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 = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -48,7 +45,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - FD9DA91BD653963BFD21153C /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,7 +52,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3A9CA3FB225058BB3750F6AB /* libPods-Runner.a in Frameworks */, + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -66,9 +62,6 @@ 4F098E1C0BAAC81A66649FD3 /* Pods */ = { isa = PBXGroup; children = ( - 0366168EF001641D77120B1B /* Pods-Runner.debug.xcconfig */, - 49DB5868150FE6C83A3256B9 /* Pods-Runner.release.xcconfig */, - 4B0CE0B78A7558A4489D1236 /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; @@ -91,7 +84,6 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 4F098E1C0BAAC81A66649FD3 /* Pods */, - BC259BD4ADE742F155776BE6 /* Frameworks */, ); sourceTree = ""; }; @@ -127,14 +119,6 @@ name = "Supporting Files"; sourceTree = ""; }; - BC259BD4ADE742F155776BE6 /* Frameworks */ = { - isa = PBXGroup; - children = ( - FD9DA91BD653963BFD21153C /* libPods-Runner.a */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -142,7 +126,6 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 8DFC6F9C3CE01544A19E06C6 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, @@ -155,6 +138,9 @@ dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -165,7 +151,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -182,6 +168,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -208,10 +197,12 @@ /* Begin PBXShellScriptBuildPhase section */ 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -220,30 +211,9 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 8DFC6F9C3CE01544A19E06C6 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -332,7 +302,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -414,7 +384,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -463,7 +433,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -549,6 +519,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/geocoding_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/geocoding_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140c..7120d2e 100644 --- a/geocoding_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/geocoding_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + + + + + + + + + + [.05]; final swatch = {}; - final r = color.red, g = color.green, b = color.blue; + final r = color.r, g = color.g, b = color.b; for (var i = 1; i < 10; i++) { strengths.add(0.1 * i); @@ -76,12 +76,13 @@ class BaseflowPluginExample extends StatelessWidget { for (var strength in strengths) { final ds = 0.5 - strength; swatch[(strength * 1000).round()] = Color.fromRGBO( - r + ((ds < 0 ? r : (255 - r)) * ds).round(), - g + ((ds < 0 ? g : (255 - g)) * ds).round(), - b + ((ds < 0 ? b : (255 - b)) * ds).round(), + (r + ((ds < 0 ? r : (255 - r)) * ds)).round(), + (g + ((ds < 0 ? g : (255 - g)) * ds)).round(), + (b + ((ds < 0 ? b : (255 - b)) * ds)).round(), 1, ); } + // ignore: deprecated_member_use return MaterialColor(color.value, swatch); } } @@ -89,7 +90,7 @@ class BaseflowPluginExample extends StatelessWidget { /// A Flutter example demonstrating how the [pluginName] plugin could be used class AppHome extends StatefulWidget { /// Constructs the [AppHome] class - const AppHome({Key? key, required this.title}) : super(key: key); + const AppHome({super.key, required this.title}); /// The [title] of the application, which is shown in the application's /// title bar. diff --git a/geocoding_ios/example/lib/plugin_example/geocode_page.dart b/geocoding_ios/example/lib/plugin_example/geocode_page.dart index 138a0f4..c934c43 100644 --- a/geocoding_ios/example/lib/plugin_example/geocode_page.dart +++ b/geocoding_ios/example/lib/plugin_example/geocode_page.dart @@ -6,7 +6,7 @@ import '../template/globals.dart'; /// Example [Widget] showing the use of the Geocode plugin class GeocodeWidget extends StatefulWidget { /// Constructs the [GeocodeWidget] class - const GeocodeWidget({Key? key}) : super(key: key); + const GeocodeWidget({super.key}); @override State createState() => _GeocodeWidgetState(); diff --git a/geocoding_ios/example/lib/template/info_page.dart b/geocoding_ios/example/lib/template/info_page.dart index 0df0faa..e664649 100644 --- a/geocoding_ios/example/lib/template/info_page.dart +++ b/geocoding_ios/example/lib/template/info_page.dart @@ -6,7 +6,7 @@ import 'globals.dart'; /// [StatelessWidget] displaying information about Baseflow class InfoPage extends StatelessWidget { /// Constructs the [InfoPage] class - const InfoPage({Key? key}) : super(key: key); + const InfoPage({super.key}); @override Widget build(BuildContext context) { diff --git a/geocoding_ios/ios/geocoding_ios.podspec b/geocoding_ios/ios/geocoding_ios.podspec index 8d3dabb..b82aa14 100644 --- a/geocoding_ios/ios/geocoding_ios.podspec +++ b/geocoding_ios/ios/geocoding_ios.podspec @@ -13,12 +13,12 @@ A new flutter plugin project. s.license = { :file => '../LICENSE' } s.author = { 'Baseflow' => 'hello@baseflow.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'geocoding_ios/Sources/**/*' + s.public_header_files = 'geocoding_ios/Sources/**/*.h' s.dependency 'Flutter' s.platform = :ios, '8.0' # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' } - s.resource_bundles = {'geocoding_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'geocoding_ios_privacy' => ['geocoding_ios/Sources/PrivacyInfo.xcprivacy']} end diff --git a/geocoding_ios/ios/geocoding_ios/.gitignore b/geocoding_ios/ios/geocoding_ios/.gitignore new file mode 100644 index 0000000..24e5b0a --- /dev/null +++ b/geocoding_ios/ios/geocoding_ios/.gitignore @@ -0,0 +1 @@ +.build diff --git a/geocoding_ios/ios/geocoding_ios/Package.swift b/geocoding_ios/ios/geocoding_ios/Package.swift new file mode 100644 index 0000000..6e0de43 --- /dev/null +++ b/geocoding_ios/ios/geocoding_ios/Package.swift @@ -0,0 +1,22 @@ +// swift-tools-version: 5.9 + +import PackageDescription + +let package = Package( + name: "geocoding_ios", + platforms: [ + .iOS("12.0") + ], + products: [ + .library(name: "geocoding-ios", targets: ["geocoding_ios"]) + ], + targets: [ + .target( + name: "geocoding_ios", + cSettings: [ + // TODO: Update your plugin name. + .headerSearchPath("include/geocoding_ios") + ] + ) + ] +) diff --git a/geocoding_ios/ios/Classes/GeocodingHandler.m b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/GeocodingHandler.m similarity index 98% rename from geocoding_ios/ios/Classes/GeocodingHandler.m rename to geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/GeocodingHandler.m index 3e12635..9290a6e 100644 --- a/geocoding_ios/ios/Classes/GeocodingHandler.m +++ b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/GeocodingHandler.m @@ -5,7 +5,7 @@ // Created by Maurits van Beusekom on 07/06/2020. // -#import "GeocodingHandler.h" +#import "include/geocoding_ios/GeocodingHandler.h" @implementation GeocodingHandler { CLGeocoder* _geocoder; diff --git a/geocoding_ios/ios/Classes/GeocodingPlugin.m b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/GeocodingPlugin.m similarity index 95% rename from geocoding_ios/ios/Classes/GeocodingPlugin.m rename to geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/GeocodingPlugin.m index 136a764..33a7657 100644 --- a/geocoding_ios/ios/Classes/GeocodingPlugin.m +++ b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/GeocodingPlugin.m @@ -5,9 +5,9 @@ // Created by Maurits van Beusekom on 07/06/2020. // -#import "CLPlacemarkExtensions.h" -#import "GeocodingHandler.h" -#import "GeocodingPlugin.h" +#import "include/geocoding_ios/CLPlacemarkExtensions.h" +#import "include/geocoding_ios/GeocodingHandler.h" +#import "include/geocoding_ios/GeocodingPlugin.h" @implementation GeocodingPlugin + (void)registerWithRegistrar:(NSObject*)registrar { diff --git a/geocoding_ios/ios/Resources/PrivacyInfo.xcprivacy b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/PrivacyInfo.xcprivacy similarity index 100% rename from geocoding_ios/ios/Resources/PrivacyInfo.xcprivacy rename to geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/PrivacyInfo.xcprivacy diff --git a/geocoding_ios/ios/Classes/Extensions/CLPlacemarkExtensions.m b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/extensions/CLPlacemarkExtensions.m similarity index 97% rename from geocoding_ios/ios/Classes/Extensions/CLPlacemarkExtensions.m rename to geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/extensions/CLPlacemarkExtensions.m index f3185e9..a18aae5 100644 --- a/geocoding_ios/ios/Classes/Extensions/CLPlacemarkExtensions.m +++ b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/extensions/CLPlacemarkExtensions.m @@ -7,7 +7,7 @@ #import #import -#import "CLPlacemarkExtensions.h" +#import "../include/geocoding_ios/CLPlacemarkExtensions.h" @implementation CLPlacemark (CLPlacemarkExtensions) diff --git a/geocoding_ios/ios/Classes/Extensions/CLPlacemarkExtensions.h b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/include/geocoding_ios/CLPlacemarkExtensions.h similarity index 100% rename from geocoding_ios/ios/Classes/Extensions/CLPlacemarkExtensions.h rename to geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/include/geocoding_ios/CLPlacemarkExtensions.h diff --git a/geocoding_ios/ios/Classes/GeocodingHandler.h b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/include/geocoding_ios/GeocodingHandler.h similarity index 100% rename from geocoding_ios/ios/Classes/GeocodingHandler.h rename to geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/include/geocoding_ios/GeocodingHandler.h diff --git a/geocoding_ios/ios/Classes/GeocodingPlugin.h b/geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/include/geocoding_ios/GeocodingPlugin.h similarity index 100% rename from geocoding_ios/ios/Classes/GeocodingPlugin.h rename to geocoding_ios/ios/geocoding_ios/Sources/geocoding_ios/include/geocoding_ios/GeocodingPlugin.h From ab0ef2ebc8160f13f292e1351dea505bbc162e9a Mon Sep 17 00:00:00 2001 From: Engels Tercero Date: Tue, 4 Feb 2025 09:56:04 -0600 Subject: [PATCH 2/3] chore: update changelog.md --- geocoding_ios/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/geocoding_ios/CHANGELOG.md b/geocoding_ios/CHANGELOG.md index ffaa32c..fc3bdee 100644 --- a/geocoding_ios/CHANGELOG.md +++ b/geocoding_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.1.0 + +* Adds SPM support + ## 3.0.1 * Adds privacy manifest. From 81d3fd4e8392271173b55e3ba4ed783442acb8b9 Mon Sep 17 00:00:00 2001 From: Engels Tercero Date: Tue, 4 Feb 2025 10:08:46 -0600 Subject: [PATCH 3/3] feat: add privacy manifest --- geocoding_ios/ios/geocoding_ios/Package.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/geocoding_ios/ios/geocoding_ios/Package.swift b/geocoding_ios/ios/geocoding_ios/Package.swift index 6e0de43..dedbaec 100644 --- a/geocoding_ios/ios/geocoding_ios/Package.swift +++ b/geocoding_ios/ios/geocoding_ios/Package.swift @@ -13,6 +13,9 @@ let package = Package( targets: [ .target( name: "geocoding_ios", + resources: [ + .process("PrivacyInfo.xcprivacy"), + ], cSettings: [ // TODO: Update your plugin name. .headerSearchPath("include/geocoding_ios")