diff --git a/plugin/.gitignore b/plugin/.gitignore index 482d6d23..2bad7a61 100644 --- a/plugin/.gitignore +++ b/plugin/.gitignore @@ -60,3 +60,12 @@ captures # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild *.tgz + +/Packages +xcuserdata/ +DerivedData/ +.swiftpm/configuration/registries.json +.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +.netrc +Package.resolved +/.build \ No newline at end of file diff --git a/plugin/CapacitorGoogleMaps.podspec b/plugin/CapacitorGoogleMaps.podspec index 5cb2df8a..ebde7fe5 100644 --- a/plugin/CapacitorGoogleMaps.podspec +++ b/plugin/CapacitorGoogleMaps.podspec @@ -7,10 +7,10 @@ Pod::Spec.new do |s| s.version = package['version'] s.summary = package['description'] s.license = package['license'] - s.homepage = 'https://capacitorjs.com' + s.homepage = package['repository']['url'] s.author = package['author'] - s.source = { :git => 'https://github.com/ionic-team/capacitor-plugins.git', :tag => package['name'] + '@' + package['version'] } - s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}', 'google-maps/ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}' + s.source = { :git => package['repository']['url'], :tag => s.version.to_s } + s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}' s.ios.deployment_target = '14.0' s.dependency 'Capacitor' s.dependency 'GoogleMaps', '~> 8.4' diff --git a/plugin/Package.swift b/plugin/Package.swift new file mode 100644 index 00000000..9f07ea98 --- /dev/null +++ b/plugin/Package.swift @@ -0,0 +1,32 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "CapacitorGoogleMaps", + platforms: [.iOS(.v14)], + products: [ + .library( + name: "CapacitorGoogleMaps", + targets: ["CapacitorGoogleMapsPlugin"]) + ], + dependencies: [ + .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"), + .package(url: "https://github.com/googlemaps/ios-maps-sdk.git", .upToNextMajor(from:"8.4.0")), + .package(url: "https://github.com/googlemaps/google-maps-ios-utils.git", .upToNextMajor(from:"5.0.0")) + ], + targets: [ + .target( + name: "CapacitorGoogleMapsPlugin", + dependencies: [ + .product(name: "Capacitor", package: "capacitor-swift-pm"), + .product(name: "Cordova", package: "capacitor-swift-pm"), + .product(name: "GoogleMaps", package: "ios-maps-sdk"), + .product(name: "GoogleMapsUtils", package: "google-maps-ios-utils") + ], + path: "ios/Sources/CapacitorGoogleMapsPlugin"), + .testTarget( + name: "CapacitorGoogleMapsPluginTests", + dependencies: ["CapacitorGoogleMapsPlugin"], + path: "ios/Tests/CapacitorGoogleMapsPluginTests") + ] +) \ No newline at end of file diff --git a/plugin/ios/.gitignore b/plugin/ios/.gitignore new file mode 100644 index 00000000..d0be0d51 --- /dev/null +++ b/plugin/ios/.gitignore @@ -0,0 +1,9 @@ + +/Packages +xcuserdata/ +DerivedData/ +.swiftpm/configuration/registries.json +.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +.netrc +.DS_Store +.build \ No newline at end of file diff --git a/plugin/ios/Plugin.xcodeproj/project.pbxproj b/plugin/ios/Plugin.xcodeproj/project.pbxproj deleted file mode 100644 index 4c62232c..00000000 --- a/plugin/ios/Plugin.xcodeproj/project.pbxproj +++ /dev/null @@ -1,643 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 48; - objects = { - -/* Begin PBXBuildFile section */ - 0238AED727C931A40012930B /* GoogleMapCameraConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0238AED627C931A40012930B /* GoogleMapCameraConfig.swift */; }; - 0238AED927C945840012930B /* GoogleMapPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0238AED827C945840012930B /* GoogleMapPadding.swift */; }; - 02404C8D279F408800CEF8C8 /* GoogleMapErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02404C8C279F408800CEF8C8 /* GoogleMapErrors.swift */; }; - 02404C8F279F43E900CEF8C8 /* GoogleMapConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02404C8E279F43E900CEF8C8 /* GoogleMapConfig.swift */; }; - 0244BF2C29DB68DF00A06018 /* Polyline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0244BF2B29DB68DF00A06018 /* Polyline.swift */; }; - 02B55EAC29E9AAAA00493664 /* Polygon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02B55EAB29E9AAAA00493664 /* Polygon.swift */; }; - 02B55EAE29EA0CF000493664 /* Circle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02B55EAD29EA0CF000493664 /* Circle.swift */; }; - 02C012C327A9D20200FAAE78 /* Marker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C012C227A9D20200FAAE78 /* Marker.swift */; }; - 02C6EDF22798803E00D51BF6 /* Map.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C6EDF12798803E00D51BF6 /* Map.swift */; }; - 03FC29A292ACC40490383A1F /* Pods_Plugin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B2A61DA5A1F2DD4F959604D /* Pods_Plugin.framework */; }; - 20C0B05DCFC8E3958A738AF2 /* Pods_PluginTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6753A823D3815DB436415E3 /* Pods_PluginTests.framework */; }; - 50ADFF92201F53D600D50D53 /* Plugin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50ADFF88201F53D600D50D53 /* Plugin.framework */; }; - 50ADFF97201F53D600D50D53 /* CapacitorGoogleMapsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50ADFF96201F53D600D50D53 /* CapacitorGoogleMapsTests.swift */; }; - 50ADFF99201F53D600D50D53 /* CapacitorGoogleMapsPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ADFF8B201F53D600D50D53 /* CapacitorGoogleMapsPlugin.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 50ADFFA42020D75100D50D53 /* Capacitor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50ADFFA52020D75100D50D53 /* Capacitor.framework */; }; - 50ADFFA82020EE4F00D50D53 /* CapacitorGoogleMapsPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 50ADFFA72020EE4F00D50D53 /* CapacitorGoogleMapsPlugin.m */; }; - 50E1A94820377CB70090CE1A /* CapacitorGoogleMapsPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E1A94720377CB70090CE1A /* CapacitorGoogleMapsPlugin.swift */; }; - 98A74CEF2D15A1D200037A0B /* TileOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98A74CEE2D15A1D100037A0B /* TileOverlay.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 50ADFF93201F53D600D50D53 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 50ADFF7F201F53D600D50D53 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 50ADFF87201F53D600D50D53; - remoteInfo = Plugin; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 0238AED627C931A40012930B /* GoogleMapCameraConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleMapCameraConfig.swift; sourceTree = ""; }; - 0238AED827C945840012930B /* GoogleMapPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleMapPadding.swift; sourceTree = ""; }; - 02404C8C279F408800CEF8C8 /* GoogleMapErrors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleMapErrors.swift; sourceTree = ""; }; - 02404C8E279F43E900CEF8C8 /* GoogleMapConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleMapConfig.swift; sourceTree = ""; }; - 0244BF2B29DB68DF00A06018 /* Polyline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Polyline.swift; sourceTree = ""; }; - 02B55EAB29E9AAAA00493664 /* Polygon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Polygon.swift; sourceTree = ""; }; - 02B55EAD29EA0CF000493664 /* Circle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Circle.swift; sourceTree = ""; }; - 02C012C227A9D20200FAAE78 /* Marker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Marker.swift; sourceTree = ""; }; - 02C6EDF12798803E00D51BF6 /* Map.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Map.swift; sourceTree = ""; }; - 3B2A61DA5A1F2DD4F959604D /* Pods_Plugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Plugin.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 50ADFF88201F53D600D50D53 /* Plugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Plugin.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 50ADFF8B201F53D600D50D53 /* CapacitorGoogleMapsPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CapacitorGoogleMapsPlugin.h; sourceTree = ""; }; - 50ADFF8C201F53D600D50D53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 50ADFF91201F53D600D50D53 /* PluginTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PluginTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 50ADFF96201F53D600D50D53 /* CapacitorGoogleMapsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacitorGoogleMapsTests.swift; sourceTree = ""; }; - 50ADFF98201F53D600D50D53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 50ADFFA52020D75100D50D53 /* Capacitor.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Capacitor.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 50ADFFA72020EE4F00D50D53 /* CapacitorGoogleMapsPlugin.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CapacitorGoogleMapsPlugin.m; sourceTree = ""; }; - 50E1A94720377CB70090CE1A /* CapacitorGoogleMapsPlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CapacitorGoogleMapsPlugin.swift; sourceTree = ""; }; - 5E23F77F099397094342571A /* Pods-Plugin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Plugin.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Plugin/Pods-Plugin.debug.xcconfig"; sourceTree = ""; }; - 91781294A431A2A7CC6EB714 /* Pods-Plugin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Plugin.release.xcconfig"; path = "Pods/Target Support Files/Pods-Plugin/Pods-Plugin.release.xcconfig"; sourceTree = ""; }; - 96ED1B6440D6672E406C8D19 /* Pods-PluginTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PluginTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests.debug.xcconfig"; sourceTree = ""; }; - 98A74CEE2D15A1D100037A0B /* TileOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TileOverlay.swift; sourceTree = ""; }; - F65BB2953ECE002E1EF3E424 /* Pods-PluginTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PluginTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-PluginTests/Pods-PluginTests.release.xcconfig"; sourceTree = ""; }; - F6753A823D3815DB436415E3 /* Pods_PluginTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PluginTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 50ADFF84201F53D600D50D53 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 50ADFFA42020D75100D50D53 /* Capacitor.framework in Frameworks */, - 03FC29A292ACC40490383A1F /* Pods_Plugin.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50ADFF8E201F53D600D50D53 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 50ADFF92201F53D600D50D53 /* Plugin.framework in Frameworks */, - 20C0B05DCFC8E3958A738AF2 /* Pods_PluginTests.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 50ADFF7E201F53D600D50D53 = { - isa = PBXGroup; - children = ( - 50ADFF8A201F53D600D50D53 /* Plugin */, - 50ADFF95201F53D600D50D53 /* PluginTests */, - 50ADFF89201F53D600D50D53 /* Products */, - 8C8E7744173064A9F6D438E3 /* Pods */, - A797B9EFA3DCEFEA1FBB66A9 /* Frameworks */, - ); - sourceTree = ""; - }; - 50ADFF89201F53D600D50D53 /* Products */ = { - isa = PBXGroup; - children = ( - 50ADFF88201F53D600D50D53 /* Plugin.framework */, - 50ADFF91201F53D600D50D53 /* PluginTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 50ADFF8A201F53D600D50D53 /* Plugin */ = { - isa = PBXGroup; - children = ( - 98A74CEE2D15A1D100037A0B /* TileOverlay.swift */, - 50E1A94720377CB70090CE1A /* CapacitorGoogleMapsPlugin.swift */, - 02C6EDF12798803E00D51BF6 /* Map.swift */, - 50ADFF8B201F53D600D50D53 /* CapacitorGoogleMapsPlugin.h */, - 50ADFFA72020EE4F00D50D53 /* CapacitorGoogleMapsPlugin.m */, - 50ADFF8C201F53D600D50D53 /* Info.plist */, - 02404C8C279F408800CEF8C8 /* GoogleMapErrors.swift */, - 02404C8E279F43E900CEF8C8 /* GoogleMapConfig.swift */, - 02C012C227A9D20200FAAE78 /* Marker.swift */, - 0238AED627C931A40012930B /* GoogleMapCameraConfig.swift */, - 0238AED827C945840012930B /* GoogleMapPadding.swift */, - 02B55EAB29E9AAAA00493664 /* Polygon.swift */, - 02B55EAD29EA0CF000493664 /* Circle.swift */, - 0244BF2B29DB68DF00A06018 /* Polyline.swift */, - ); - path = Plugin; - sourceTree = ""; - }; - 50ADFF95201F53D600D50D53 /* PluginTests */ = { - isa = PBXGroup; - children = ( - 50ADFF96201F53D600D50D53 /* CapacitorGoogleMapsTests.swift */, - 50ADFF98201F53D600D50D53 /* Info.plist */, - ); - path = PluginTests; - sourceTree = ""; - }; - 8C8E7744173064A9F6D438E3 /* Pods */ = { - isa = PBXGroup; - children = ( - 5E23F77F099397094342571A /* Pods-Plugin.debug.xcconfig */, - 91781294A431A2A7CC6EB714 /* Pods-Plugin.release.xcconfig */, - 96ED1B6440D6672E406C8D19 /* Pods-PluginTests.debug.xcconfig */, - F65BB2953ECE002E1EF3E424 /* Pods-PluginTests.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; - A797B9EFA3DCEFEA1FBB66A9 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 50ADFFA52020D75100D50D53 /* Capacitor.framework */, - 3B2A61DA5A1F2DD4F959604D /* Pods_Plugin.framework */, - F6753A823D3815DB436415E3 /* Pods_PluginTests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 50ADFF85201F53D600D50D53 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 50ADFF99201F53D600D50D53 /* CapacitorGoogleMapsPlugin.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 50ADFF87201F53D600D50D53 /* Plugin */ = { - isa = PBXNativeTarget; - buildConfigurationList = 50ADFF9C201F53D600D50D53 /* Build configuration list for PBXNativeTarget "Plugin" */; - buildPhases = ( - AB5B3E54B4E897F32C2279DA /* [CP] Check Pods Manifest.lock */, - 50ADFF83201F53D600D50D53 /* Sources */, - 50ADFF84201F53D600D50D53 /* Frameworks */, - 50ADFF85201F53D600D50D53 /* Headers */, - 50ADFF86201F53D600D50D53 /* Resources */, - 27D2989C782FE41D4C77DB9C /* [CP] Copy Pods Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Plugin; - productName = Plugin; - productReference = 50ADFF88201F53D600D50D53 /* Plugin.framework */; - productType = "com.apple.product-type.framework"; - }; - 50ADFF90201F53D600D50D53 /* PluginTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 50ADFF9F201F53D600D50D53 /* Build configuration list for PBXNativeTarget "PluginTests" */; - buildPhases = ( - 0596884F929ED6F1DE134961 /* [CP] Check Pods Manifest.lock */, - 50ADFF8D201F53D600D50D53 /* Sources */, - 50ADFF8E201F53D600D50D53 /* Frameworks */, - 50ADFF8F201F53D600D50D53 /* Resources */, - 387C5C3A5D666D8067A600EA /* [CP] Copy Pods Resources */, - C882D7637EC714DA7E344B36 /* [CP] Embed Pods Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 50ADFF94201F53D600D50D53 /* PBXTargetDependency */, - ); - name = PluginTests; - productName = PluginTests; - productReference = 50ADFF91201F53D600D50D53 /* PluginTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 50ADFF7F201F53D600D50D53 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1160; - ORGANIZATIONNAME = "Max Lynch"; - TargetAttributes = { - 50ADFF87201F53D600D50D53 = { - CreatedOnToolsVersion = 9.2; - LastSwiftMigration = 1100; - ProvisioningStyle = Automatic; - }; - 50ADFF90201F53D600D50D53 = { - CreatedOnToolsVersion = 9.2; - LastSwiftMigration = 1100; - ProvisioningStyle = Automatic; - }; - }; - }; - buildConfigurationList = 50ADFF82201F53D600D50D53 /* Build configuration list for PBXProject "Plugin" */; - compatibilityVersion = "Xcode 8.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 50ADFF7E201F53D600D50D53; - productRefGroup = 50ADFF89201F53D600D50D53 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 50ADFF87201F53D600D50D53 /* Plugin */, - 50ADFF90201F53D600D50D53 /* PluginTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 50ADFF86201F53D600D50D53 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50ADFF8F201F53D600D50D53 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 0596884F929ED6F1DE134961 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PluginTests-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; - }; - 27D2989C782FE41D4C77DB9C /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Plugin/Pods-Plugin-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Plugin/Pods-Plugin-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 387C5C3A5D666D8067A600EA /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PluginTests/Pods-PluginTests-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PluginTests/Pods-PluginTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - AB5B3E54B4E897F32C2279DA /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Plugin-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; - }; - C882D7637EC714DA7E344B36 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PluginTests/Pods-PluginTests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Capacitor/Capacitor.framework", - "${BUILT_PRODUCTS_DIR}/CapacitorCordova/Cordova.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Capacitor.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cordova.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PluginTests/Pods-PluginTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 50ADFF83201F53D600D50D53 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 0244BF2C29DB68DF00A06018 /* Polyline.swift in Sources */, - 02404C8D279F408800CEF8C8 /* GoogleMapErrors.swift in Sources */, - 50E1A94820377CB70090CE1A /* CapacitorGoogleMapsPlugin.swift in Sources */, - 0238AED727C931A40012930B /* GoogleMapCameraConfig.swift in Sources */, - 0238AED927C945840012930B /* GoogleMapPadding.swift in Sources */, - 02404C8F279F43E900CEF8C8 /* GoogleMapConfig.swift in Sources */, - 98A74CEF2D15A1D200037A0B /* TileOverlay.swift in Sources */, - 02B55EAE29EA0CF000493664 /* Circle.swift in Sources */, - 02B55EAC29E9AAAA00493664 /* Polygon.swift in Sources */, - 02C6EDF22798803E00D51BF6 /* Map.swift in Sources */, - 50ADFFA82020EE4F00D50D53 /* CapacitorGoogleMapsPlugin.m in Sources */, - 02C012C327A9D20200FAAE78 /* Marker.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 50ADFF8D201F53D600D50D53 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 50ADFF97201F53D600D50D53 /* CapacitorGoogleMapsTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 50ADFF94201F53D600D50D53 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 50ADFF87201F53D600D50D53 /* Plugin */; - targetProxy = 50ADFF93201F53D600D50D53 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 50ADFF9A201F53D600D50D53 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "\"${BUILT_PRODUCTS_DIR}/Capacitor\"", - "\"${BUILT_PRODUCTS_DIR}/CapacitorCordova\"", - ); - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 50ADFF9B201F53D600D50D53 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "\"${BUILT_PRODUCTS_DIR}/Capacitor\"", - "\"${BUILT_PRODUCTS_DIR}/CapacitorCordova\"", - ); - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 50ADFF9D201F53D600D50D53 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5E23F77F099397094342571A /* Pods-Plugin.debug.xcconfig */; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Plugin/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)"; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 50ADFF9E201F53D600D50D53 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 91781294A431A2A7CC6EB714 /* Pods-Plugin.release.xcconfig */; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Plugin/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 50ADFFA0201F53D600D50D53 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 96ED1B6440D6672E406C8D19 /* Pods-PluginTests.debug.xcconfig */; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = PluginTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.PluginTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 50ADFFA1201F53D600D50D53 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = F65BB2953ECE002E1EF3E424 /* Pods-PluginTests.release.xcconfig */; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = PluginTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.PluginTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 50ADFF82201F53D600D50D53 /* Build configuration list for PBXProject "Plugin" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 50ADFF9A201F53D600D50D53 /* Debug */, - 50ADFF9B201F53D600D50D53 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 50ADFF9C201F53D600D50D53 /* Build configuration list for PBXNativeTarget "Plugin" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 50ADFF9D201F53D600D50D53 /* Debug */, - 50ADFF9E201F53D600D50D53 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 50ADFF9F201F53D600D50D53 /* Build configuration list for PBXNativeTarget "PluginTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 50ADFFA0201F53D600D50D53 /* Debug */, - 50ADFFA1201F53D600D50D53 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 50ADFF7F201F53D600D50D53 /* Project object */; -} diff --git a/plugin/ios/Plugin.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/plugin/ios/Plugin.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 919434a6..00000000 --- a/plugin/ios/Plugin.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/plugin/ios/Plugin.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/plugin/ios/Plugin.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/plugin/ios/Plugin.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/plugin/ios/Plugin.xcodeproj/xcshareddata/xcschemes/Plugin.xcscheme b/plugin/ios/Plugin.xcodeproj/xcshareddata/xcschemes/Plugin.xcscheme deleted file mode 100644 index 303f2621..00000000 --- a/plugin/ios/Plugin.xcodeproj/xcshareddata/xcschemes/Plugin.xcscheme +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugin/ios/Plugin.xcodeproj/xcshareddata/xcschemes/PluginTests.xcscheme b/plugin/ios/Plugin.xcodeproj/xcshareddata/xcschemes/PluginTests.xcscheme deleted file mode 100644 index 3d8c88d2..00000000 --- a/plugin/ios/Plugin.xcodeproj/xcshareddata/xcschemes/PluginTests.xcscheme +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugin/ios/Plugin.xcworkspace/contents.xcworkspacedata b/plugin/ios/Plugin.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index afad624e..00000000 --- a/plugin/ios/Plugin.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/plugin/ios/Plugin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/plugin/ios/Plugin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/plugin/ios/Plugin.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/plugin/ios/Plugin/CapacitorGoogleMapsPlugin.h b/plugin/ios/Plugin/CapacitorGoogleMapsPlugin.h deleted file mode 100644 index f2bd9e0b..00000000 --- a/plugin/ios/Plugin/CapacitorGoogleMapsPlugin.h +++ /dev/null @@ -1,10 +0,0 @@ -#import - -//! Project version number for Plugin. -FOUNDATION_EXPORT double PluginVersionNumber; - -//! Project version string for Plugin. -FOUNDATION_EXPORT const unsigned char PluginVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - diff --git a/plugin/ios/Plugin/CapacitorGoogleMapsPlugin.m b/plugin/ios/Plugin/CapacitorGoogleMapsPlugin.m deleted file mode 100644 index 723cd263..00000000 --- a/plugin/ios/Plugin/CapacitorGoogleMapsPlugin.m +++ /dev/null @@ -1,40 +0,0 @@ -#import -#import - -// Define the plugin using the CAP_PLUGIN Macro, and -// each method the plugin supports using the CAP_PLUGIN_METHOD macro. -CAP_PLUGIN(CapacitorGoogleMapsPlugin, "CapacitorGoogleMaps", - CAP_PLUGIN_METHOD(create, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(enableTouch, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(disableTouch, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(addTileOverlay, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(removeTileOverlay, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(addMarker, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(addMarkers, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(addPolygons, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(addPolylines, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(addCircles, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(removeMarker, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(removeMarkers, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(removeCircles, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(removePolygons, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(removePolylines, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(enableClustering, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(disableClustering, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(destroy, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(setCamera, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(getMapType, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(setMapType, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(enableIndoorMaps, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(enableTrafficLayer, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(enableAccessibilityElements, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(enableCurrentLocation, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(setPadding, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(onScroll, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(onResize, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(onDisplay, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(getMapBounds, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(fitBounds, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(mapBoundsContains, CAPPluginReturnPromise); - CAP_PLUGIN_METHOD(mapBoundsExtend, CAPPluginReturnPromise); -) diff --git a/plugin/ios/Plugin/Info.plist b/plugin/ios/Plugin/Info.plist deleted file mode 100644 index 1007fd9d..00000000 --- a/plugin/ios/Plugin/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/plugin/ios/PluginTests/Info.plist b/plugin/ios/PluginTests/Info.plist deleted file mode 100644 index 6c40a6cd..00000000 --- a/plugin/ios/PluginTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/plugin/ios/Podfile b/plugin/ios/Podfile deleted file mode 100644 index acd5b891..00000000 --- a/plugin/ios/Podfile +++ /dev/null @@ -1,20 +0,0 @@ -platform :ios, '14.0' - -def capacitor_pods - # Comment the next line if you're not using Swift and don't want to use dynamic frameworks - use_frameworks! - pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' - pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' -end - -target 'Plugin' do - capacitor_pods - pod 'GoogleMaps', '~> 8.4' - pod 'Google-Maps-iOS-Utils', '~> 5.0' -end - -target 'PluginTests' do - capacitor_pods - pod 'GoogleMaps', '~> 8.4' - pod 'Google-Maps-iOS-Utils', '~> 5.0' -end diff --git a/plugin/ios/Plugin/CapacitorGoogleMapsPlugin.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/CapacitorGoogleMapsPlugin.swift similarity index 93% rename from plugin/ios/Plugin/CapacitorGoogleMapsPlugin.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/CapacitorGoogleMapsPlugin.swift index 2519b41a..55a830ed 100644 --- a/plugin/ios/Plugin/CapacitorGoogleMapsPlugin.swift +++ b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/CapacitorGoogleMapsPlugin.swift @@ -64,7 +64,44 @@ extension CGRect { // swiftlint:disable type_body_length @objc(CapacitorGoogleMapsPlugin) -public class CapacitorGoogleMapsPlugin: CAPPlugin, GMSMapViewDelegate { +public class CapacitorGoogleMapsPlugin: CAPPlugin, GMSMapViewDelegate, CAPBridgedPlugin { + public let identifier = "CapacitorGoogleMapsPlugin" + public let jsName = "CapacitorGoogleMaps" + public let pluginMethods: [CAPPluginMethod] = [ + CAPPluginMethod(name: "create", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "enableTouch", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "disableTouch", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "addTileOverlay", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "removeTileOverlay", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "addMarker", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "addMarkers", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "addPolygons", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "addPolylines", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "addCircles", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "removeMarker", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "removeMarkers", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "removeCircles", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "removePolygons", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "removePolylines", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "enableClustering", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "disableClustering", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "destroy", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "setCamera", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "getMapType", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "setMapType", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "enableIndoorMaps", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "enableTrafficLayer", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "enableAccessibilityElements", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "enableCurrentLocation", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "setPadding", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "onScroll", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "onResize", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "onDisplay", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "getMapBounds", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "fitBounds", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "mapBoundsContains", returnType: CAPPluginReturnPromise), + CAPPluginMethod(name: "mapBoundsExtend", returnType: CAPPluginReturnPromise) + ] private var maps = [String: Map]() private var isInitialized = false private var locationManager = CLLocationManager() diff --git a/plugin/ios/Plugin/Circle.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/Circle.swift similarity index 100% rename from plugin/ios/Plugin/Circle.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/Circle.swift diff --git a/plugin/ios/Plugin/GoogleMapCameraConfig.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/GoogleMapCameraConfig.swift similarity index 100% rename from plugin/ios/Plugin/GoogleMapCameraConfig.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/GoogleMapCameraConfig.swift diff --git a/plugin/ios/Plugin/GoogleMapConfig.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/GoogleMapConfig.swift similarity index 100% rename from plugin/ios/Plugin/GoogleMapConfig.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/GoogleMapConfig.swift diff --git a/plugin/ios/Plugin/GoogleMapErrors.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/GoogleMapErrors.swift similarity index 100% rename from plugin/ios/Plugin/GoogleMapErrors.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/GoogleMapErrors.swift diff --git a/plugin/ios/Plugin/GoogleMapPadding.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/GoogleMapPadding.swift similarity index 100% rename from plugin/ios/Plugin/GoogleMapPadding.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/GoogleMapPadding.swift diff --git a/plugin/ios/Plugin/Map.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/Map.swift similarity index 100% rename from plugin/ios/Plugin/Map.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/Map.swift diff --git a/plugin/ios/Plugin/Marker.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/Marker.swift similarity index 100% rename from plugin/ios/Plugin/Marker.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/Marker.swift diff --git a/plugin/ios/Plugin/Polygon.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/Polygon.swift similarity index 100% rename from plugin/ios/Plugin/Polygon.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/Polygon.swift diff --git a/plugin/ios/Plugin/Polyline.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/Polyline.swift similarity index 100% rename from plugin/ios/Plugin/Polyline.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/Polyline.swift diff --git a/plugin/ios/Plugin/TileOverlay.swift b/plugin/ios/Sources/CapacitorGoogleMapsPlugin/TileOverlay.swift similarity index 100% rename from plugin/ios/Plugin/TileOverlay.swift rename to plugin/ios/Sources/CapacitorGoogleMapsPlugin/TileOverlay.swift diff --git a/plugin/ios/PluginTests/CapacitorGoogleMapsTests.swift b/plugin/ios/Tests/CapacitorGoogleMapsPluginTests/CapacitorGoogleMapsTests.swift similarity index 100% rename from plugin/ios/PluginTests/CapacitorGoogleMapsTests.swift rename to plugin/ios/Tests/CapacitorGoogleMapsPluginTests/CapacitorGoogleMapsTests.swift diff --git a/plugin/package.json b/plugin/package.json index 2eedcec2..4024668c 100644 --- a/plugin/package.json +++ b/plugin/package.json @@ -17,8 +17,10 @@ "android/src/main/", "android/build.gradle", "dist/", - "ios/Plugin/", - "CapacitorGoogleMaps.podspec" + "CapacitorGoogleMaps.podspec", + "ios/Sources", + "ios/Tests", + "Package.swift" ], "author": "Ionic ", "license": "MIT", @@ -37,7 +39,7 @@ ], "scripts": { "verify": "pnpm run verify:ios && pnpm run verify:android && pnpm run verify:web", - "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin -sdk iphonesimulator && cd ..", + "verify:ios": "xcodebuild build -scheme CapacitorGoogleMaps -destination generic/platform=iOS", "verify:android": "cd android && ./gradlew clean build test && cd ..", "verify:web": "pnpm run build", "lint": "pnpm eslint . --ext ts && pnpm prettier \"./**/*.{css,html,ts,js,java}\" --check && pnpm node-swiftlint lint", diff --git a/plugin/swiftlint.config.js b/plugin/swiftlint.config.js index 3a7ec6de..0d80786b 100644 --- a/plugin/swiftlint.config.js +++ b/plugin/swiftlint.config.js @@ -1,7 +1,7 @@ /* eslint-disable no-undef */ module.exports = { // eslint-disable-next-line no-template-curly-in-string - included: ['${PWD}/ios/Plugin'], + included: ['${PWD}/ios/Sources', '${PWD}/ios/Tests'], identifier_name: { min_length: { warning: 3,