diff --git a/README.md b/README.md index 0320e954..0a79e8fb 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,17 @@ The Google Maps SDK supports the use of showing the users current location via ` Read about [Configuring `Info.plist`](https://capacitorjs.com/docs/ios/configuration#configuring-infoplist) in the [iOS Guide](https://capacitorjs.com/docs/ios) for more information on setting iOS permissions in Xcode. +### Google Maps SDK versions + +The native Google Maps SDK version used by the plugin depends on how your app consumes it: + +- **Swift Package Manager**: [Google Maps SDK](https://github.com/googlemaps/ios-maps-sdk) 10.x and [Google Maps iOS Utils](https://github.com/googlemaps/google-maps-ios-utils) 7.x. +- **CocoaPods**: Google Maps SDK 9.4.0 and Google Maps iOS Utils 6.1.0. These are the latest versions available on CocoaPods, as Google no longer publishes the Maps SDK to the CocoaPods Trunk. + +Note that Google Maps SDK 10.x renders maps in dark mode by default when the device is in dark mode, so the map appearance can differ between the two setups. + +> **Warning**: CocoaPods support will be removed in Capacitor 10. We recommend migrating to Swift Package Manager. + ### Typescript Configuration Your project will also need have `skipLibCheck` set to `true` in `tsconfig.json`. diff --git a/example-app-spm/ios/App/App.xcodeproj/project.pbxproj b/example-app-spm/ios/App/App.xcodeproj/project.pbxproj index 57b67cbe..6bb87ca8 100644 --- a/example-app-spm/ios/App/App.xcodeproj/project.pbxproj +++ b/example-app-spm/ios/App/App.xcodeproj/project.pbxproj @@ -297,6 +297,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = EVSWK8BA55; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -305,7 +306,7 @@ ); MARKETING_VERSION = 1.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; - PRODUCT_BUNDLE_IDENTIFIER = com.capacitorjs.maps_spm; + PRODUCT_BUNDLE_IDENTIFIER = "com.outsystems.rd.maps-spm"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_VERSION = 5.0; @@ -319,6 +320,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = EVSWK8BA55; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -326,7 +328,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.capacitorjs.maps_spm; + PRODUCT_BUNDLE_IDENTIFIER = "com.outsystems.rd.maps-spm"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_VERSION = 5.0; diff --git a/example-app-spm/ios/App/CapApp-SPM/Package.swift b/example-app-spm/ios/App/CapApp-SPM/Package.swift index ec4f3e9e..c2dc39d0 100644 --- a/example-app-spm/ios/App/CapApp-SPM/Package.swift +++ b/example-app-spm/ios/App/CapApp-SPM/Package.swift @@ -11,12 +11,12 @@ let package = Package( targets: ["CapApp-SPM"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "9.0.0-alpha.5"), - .package(name: "CapacitorApp", path: "../../../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/app"), + .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "9.0.0-alpha.6"), + .package(name: "CapacitorApp", path: "../../../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/app"), .package(name: "CapacitorGoogleMaps", path: "../../../../plugin"), - .package(name: "CapacitorHaptics", path: "../../../../node_modules/.pnpm/@capacitor+haptics@9.0.0-next.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/haptics"), - .package(name: "CapacitorKeyboard", path: "../../../../node_modules/.pnpm/@capacitor+keyboard@9.0.0-next.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/keyboard"), - .package(name: "CapacitorStatusBar", path: "../../../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/status-bar") + .package(name: "CapacitorHaptics", path: "../../../../node_modules/.pnpm/@capacitor+haptics@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/haptics"), + .package(name: "CapacitorKeyboard", path: "../../../../node_modules/.pnpm/@capacitor+keyboard@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/keyboard"), + .package(name: "CapacitorStatusBar", path: "../../../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/status-bar") ], targets: [ .target( diff --git a/example-app/android/capacitor.settings.gradle b/example-app/android/capacitor.settings.gradle index 482f7a9c..7970de58 100644 --- a/example-app/android/capacitor.settings.gradle +++ b/example-app/android/capacitor.settings.gradle @@ -1,19 +1,19 @@ // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN include ':capacitor-android' -project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@9.0.0-alpha.5_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/android/capacitor') +project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@9.0.0-alpha.6_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/android/capacitor') include ':capacitor-app' -project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/app/android') +project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/app/android') include ':capacitor-google-maps' project(':capacitor-google-maps').projectDir = new File('../../plugin/android') include ':capacitor-haptics' -project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@9.0.0-next.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/haptics/android') +project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/haptics/android') include ':capacitor-keyboard' -project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@9.0.0-next.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/keyboard/android') +project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/keyboard/android') include ':capacitor-status-bar' -project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/status-bar/android') +project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/status-bar/android') diff --git a/example-app/ios/App/Podfile b/example-app/ios/App/Podfile index 2e5386fa..66b5cc3a 100644 --- a/example-app/ios/App/Podfile +++ b/example-app/ios/App/Podfile @@ -1,4 +1,4 @@ -require_relative '../../../node_modules/.pnpm/@capacitor+ios@9.0.0-alpha.5_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/ios/scripts/pods_helpers' +require_relative '../../../node_modules/.pnpm/@capacitor+ios@9.0.0-alpha.6_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/ios/scripts/pods_helpers' platform :ios, '16.0' use_frameworks! @@ -9,12 +9,12 @@ use_frameworks! install! 'cocoapods', :disable_input_output_paths => true def capacitor_pods - pod 'Capacitor', :path => '../../../node_modules/.pnpm/@capacitor+ios@9.0.0-alpha.5_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/ios' - pod 'CapacitorApp', :path => '../../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/app' + pod 'Capacitor', :path => '../../../node_modules/.pnpm/@capacitor+ios@9.0.0-alpha.6_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/ios' + pod 'CapacitorApp', :path => '../../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/app' pod 'CapacitorGoogleMaps', :path => '../../../plugin' - pod 'CapacitorHaptics', :path => '../../../node_modules/.pnpm/@capacitor+haptics@9.0.0-next.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/haptics' - pod 'CapacitorKeyboard', :path => '../../../node_modules/.pnpm/@capacitor+keyboard@9.0.0-next.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/keyboard' - pod 'CapacitorStatusBar', :path => '../../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/status-bar' + pod 'CapacitorHaptics', :path => '../../../node_modules/.pnpm/@capacitor+haptics@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/haptics' + pod 'CapacitorKeyboard', :path => '../../../node_modules/.pnpm/@capacitor+keyboard@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/keyboard' + pod 'CapacitorStatusBar', :path => '../../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/status-bar' end target 'App' do diff --git a/plugin/Package.swift b/plugin/Package.swift index 70f87b67..207e91d4 100644 --- a/plugin/Package.swift +++ b/plugin/Package.swift @@ -11,8 +11,8 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "9.0.0-alpha.5"), - .package(url: "https://github.com/googlemaps/ios-maps-sdk.git", .upToNextMajor(from:"9.4.0")), - .package(url: "https://github.com/googlemaps/google-maps-ios-utils.git", .exact("6.1.0")) + .package(url: "https://github.com/googlemaps/ios-maps-sdk.git", .upToNextMajor(from:"10.15.0")), + .package(url: "https://github.com/googlemaps/google-maps-ios-utils.git", .exact("7.1.0")) ], targets: [ .target( diff --git a/plugin/README.md b/plugin/README.md index 0320e954..0a79e8fb 100644 --- a/plugin/README.md +++ b/plugin/README.md @@ -21,6 +21,17 @@ The Google Maps SDK supports the use of showing the users current location via ` Read about [Configuring `Info.plist`](https://capacitorjs.com/docs/ios/configuration#configuring-infoplist) in the [iOS Guide](https://capacitorjs.com/docs/ios) for more information on setting iOS permissions in Xcode. +### Google Maps SDK versions + +The native Google Maps SDK version used by the plugin depends on how your app consumes it: + +- **Swift Package Manager**: [Google Maps SDK](https://github.com/googlemaps/ios-maps-sdk) 10.x and [Google Maps iOS Utils](https://github.com/googlemaps/google-maps-ios-utils) 7.x. +- **CocoaPods**: Google Maps SDK 9.4.0 and Google Maps iOS Utils 6.1.0. These are the latest versions available on CocoaPods, as Google no longer publishes the Maps SDK to the CocoaPods Trunk. + +Note that Google Maps SDK 10.x renders maps in dark mode by default when the device is in dark mode, so the map appearance can differ between the two setups. + +> **Warning**: CocoaPods support will be removed in Capacitor 10. We recommend migrating to Swift Package Manager. + ### Typescript Configuration Your project will also need have `skipLibCheck` set to `true` in `tsconfig.json`. diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f8a8fa7c..24015729 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,28 +28,28 @@ importers: dependencies: '@capacitor/android': specifier: next - version: 9.0.0-alpha.5(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-alpha.6(@capacitor/core@9.0.0-alpha.6) '@capacitor/app': specifier: next - version: 9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.6) '@capacitor/core': specifier: next - version: 9.0.0-alpha.5 + version: 9.0.0-alpha.6 '@capacitor/google-maps': specifier: workspace:* version: link:../plugin '@capacitor/haptics': specifier: next - version: 9.0.0-next.1(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-next.1(@capacitor/core@9.0.0-alpha.6) '@capacitor/ios': specifier: next - version: 9.0.0-alpha.5(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-alpha.6(@capacitor/core@9.0.0-alpha.6) '@capacitor/keyboard': specifier: next - version: 9.0.0-next.1(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-next.1(@capacitor/core@9.0.0-alpha.6) '@capacitor/status-bar': specifier: next - version: 9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.6) '@ionic/react': specifier: ^8.8.13 version: 8.8.13(react-dom@19.2.7(react@19.2.7))(react@19.2.7) @@ -149,34 +149,34 @@ importers: devDependencies: '@capacitor/cli': specifier: next - version: 9.0.0-alpha.5 + version: 9.0.0-alpha.6 example-app-spm: dependencies: '@capacitor/android': specifier: next - version: 9.0.0-alpha.5(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-alpha.6(@capacitor/core@9.0.0-alpha.6) '@capacitor/app': specifier: next - version: 9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.6) '@capacitor/core': specifier: next - version: 9.0.0-alpha.5 + version: 9.0.0-alpha.6 '@capacitor/google-maps': specifier: workspace:* version: link:../plugin '@capacitor/haptics': specifier: next - version: 9.0.0-next.1(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-next.1(@capacitor/core@9.0.0-alpha.6) '@capacitor/ios': specifier: next - version: 9.0.0-alpha.5(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-alpha.6(@capacitor/core@9.0.0-alpha.6) '@capacitor/keyboard': specifier: next - version: 9.0.0-next.1(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-next.1(@capacitor/core@9.0.0-alpha.6) '@capacitor/status-bar': specifier: next - version: 9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.5) + version: 9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.6) '@ionic/react': specifier: ^8.8.13 version: 8.8.13(react-dom@19.2.7(react@19.2.7))(react@19.2.7) @@ -276,7 +276,7 @@ importers: devDependencies: '@capacitor/cli': specifier: next - version: 9.0.0-alpha.5 + version: 9.0.0-alpha.6 plugin: dependencies: @@ -1075,19 +1075,27 @@ packages: peerDependencies: '@capacitor/core': ^9.0.0-alpha.5 + '@capacitor/android@9.0.0-alpha.6': + resolution: {integrity: sha512-/hVYtjrvaoLinn8fkcnm2prCo7OSgbwP6x+tzQa+IQChTMsyBTAp/eWEvKCxh0EVQeUUWmRtLXd2CzhPamjdFA==} + peerDependencies: + '@capacitor/core': ^9.0.0-alpha.6 + '@capacitor/app@9.0.0-alpha.1': resolution: {integrity: sha512-2W/wOMctLxTA+lV7BIPcuSzK7xnHPxNd3+Y/qqqW0ENOJoI/8CNUUVX20F904iB0sP7SCe5BqM/qc5AB6n+uqw==} peerDependencies: '@capacitor/core': '>=9.0.0-alpha.0' - '@capacitor/cli@9.0.0-alpha.5': - resolution: {integrity: sha512-ugCtlP1GyoSN9ot8MXRaIEpqBoD0Z8DrryKRygPusUVVizJffuE0LJXXXctl4MHFVcpb2h4K9fAwKycoy29wTQ==} + '@capacitor/cli@9.0.0-alpha.6': + resolution: {integrity: sha512-PsPkbmK1SffBuv7kb6Htebyht2Y2tDJRPWvnxW/s8Y3BHv4LbCEhlIE3PeB+AnDgGNTAGp2e9BnTgWUHcmN7OQ==} engines: {node: '>=22.0.0'} hasBin: true '@capacitor/core@9.0.0-alpha.5': resolution: {integrity: sha512-ZB/4nWYzUW/U39QpGd4lK1N1KwWQSXCuAYpIu3heaf+L4SMx0YVEvQhqg3yE/hfBdcNiqveTm2HfmOBGfh2Gaw==} + '@capacitor/core@9.0.0-alpha.6': + resolution: {integrity: sha512-AqCxIP+84lNNh1E+Yv04FRF9Pg8MTm+ed8QEC8OGOI4epbMwCEDdS0W84+C9ZAs+6cFtQcIS5N2owhOy2KeOOQ==} + '@capacitor/docgen@0.3.0': resolution: {integrity: sha512-WPggobo5Ql70F+2xOIUwNSApJXaL9F/9+Al6B+sNuSAmcg484OAksyUPKgiynF4BVlxeY5a0sDkgdVkmmA3ElQ==} engines: {node: '>=18.0.0'} @@ -1103,6 +1111,11 @@ packages: peerDependencies: '@capacitor/core': ^9.0.0-alpha.5 + '@capacitor/ios@9.0.0-alpha.6': + resolution: {integrity: sha512-eFKuHmVdCnKMZ/+cMl24Up0yzLMFxS0vYXJLf62/556cHqTO9n7BBeXPCNIPpL5EV+wrVCw7Hq/xwXf7p2mGoQ==} + peerDependencies: + '@capacitor/core': ^9.0.0-alpha.6 + '@capacitor/keyboard@9.0.0-next.1': resolution: {integrity: sha512-6yLbKtYRbB2gzOPYAiN4ZsSZto6eFAMZprWkwWqD9ID7M1Hb+YpXWY/DnFAUaaK/AWNIJFU7PqvmS2glm66rgQ==} peerDependencies: @@ -9077,11 +9090,15 @@ snapshots: dependencies: '@capacitor/core': 9.0.0-alpha.5 - '@capacitor/app@9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.5)': + '@capacitor/android@9.0.0-alpha.6(@capacitor/core@9.0.0-alpha.6)': dependencies: - '@capacitor/core': 9.0.0-alpha.5 + '@capacitor/core': 9.0.0-alpha.6 + + '@capacitor/app@9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.6)': + dependencies: + '@capacitor/core': 9.0.0-alpha.6 - '@capacitor/cli@9.0.0-alpha.5': + '@capacitor/cli@9.0.0-alpha.6': dependencies: '@ionic/cli-framework-output': 2.2.8 '@ionic/utils-subprocess': 3.0.1 @@ -9107,6 +9124,10 @@ snapshots: dependencies: tslib: 2.8.1 + '@capacitor/core@9.0.0-alpha.6': + dependencies: + tslib: 2.8.1 + '@capacitor/docgen@0.3.0': dependencies: '@types/node': 14.18.63 @@ -9115,21 +9136,25 @@ snapshots: minimist: 1.2.8 typescript: 4.2.4 - '@capacitor/haptics@9.0.0-next.1(@capacitor/core@9.0.0-alpha.5)': + '@capacitor/haptics@9.0.0-next.1(@capacitor/core@9.0.0-alpha.6)': dependencies: - '@capacitor/core': 9.0.0-alpha.5 + '@capacitor/core': 9.0.0-alpha.6 '@capacitor/ios@9.0.0-alpha.5(@capacitor/core@9.0.0-alpha.5)': dependencies: '@capacitor/core': 9.0.0-alpha.5 - '@capacitor/keyboard@9.0.0-next.1(@capacitor/core@9.0.0-alpha.5)': + '@capacitor/ios@9.0.0-alpha.6(@capacitor/core@9.0.0-alpha.6)': dependencies: - '@capacitor/core': 9.0.0-alpha.5 + '@capacitor/core': 9.0.0-alpha.6 - '@capacitor/status-bar@9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.5)': + '@capacitor/keyboard@9.0.0-next.1(@capacitor/core@9.0.0-alpha.6)': dependencies: - '@capacitor/core': 9.0.0-alpha.5 + '@capacitor/core': 9.0.0-alpha.6 + + '@capacitor/status-bar@9.0.0-alpha.1(@capacitor/core@9.0.0-alpha.6)': + dependencies: + '@capacitor/core': 9.0.0-alpha.6 '@chevrotain/cst-dts-gen@11.0.3': dependencies: @@ -11526,7 +11551,7 @@ snapshots: minipass-pipeline: 1.2.4 p-map: 7.0.4 ssri: 12.0.0 - tar: 7.5.2 + tar: 7.5.19 unique-filename: 4.0.0 cacache@20.0.3: @@ -14793,7 +14818,7 @@ snapshots: nopt: 8.1.0 proc-log: 5.0.0 semver: 7.7.3 - tar: 7.5.2 + tar: 7.5.19 tinyglobby: 0.2.12 which: 5.0.0 transitivePeerDependencies: @@ -15175,7 +15200,7 @@ snapshots: promise-retry: 2.0.1 sigstore: 4.1.0 ssri: 13.0.0 - tar: 7.5.2 + tar: 7.5.19 transitivePeerDependencies: - supports-color