diff --git a/geocoding/example/ios/Flutter/.gitignore b/geocoding/example/ios/Flutter/.gitignore new file mode 100644 index 0000000..f5f6cc9 --- /dev/null +++ b/geocoding/example/ios/Flutter/.gitignore @@ -0,0 +1 @@ +ephemeral diff --git a/geocoding_ios/CHANGELOG.md b/geocoding_ios/CHANGELOG.md index 3e5ea30..2b26375 100644 --- a/geocoding_ios/CHANGELOG.md +++ b/geocoding_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.1.0 + +* Adds SPM support + ## 3.0.2 * Fixed deprecation warnings. diff --git a/geocoding_ios/example/ios/Flutter/.gitignore b/geocoding_ios/example/ios/Flutter/.gitignore new file mode 100644 index 0000000..f5f6cc9 --- /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 cca6995..a2c0060 100644 --- a/geocoding_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/geocoding_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -8,8 +8,8 @@ /* 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 */, @@ -156,6 +139,9 @@ dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -183,6 +169,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -223,28 +212,6 @@ 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; @@ -570,6 +537,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 4f74653..2c3563b 100644 --- a/geocoding_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/geocoding_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + '../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..dedbaec --- /dev/null +++ b/geocoding_ios/ios/geocoding_ios/Package.swift @@ -0,0 +1,25 @@ +// 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", + resources: [ + .process("PrivacyInfo.xcprivacy"), + ], + 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