Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
6 changes: 4 additions & 2 deletions example-app-spm/ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand All @@ -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;
Expand All @@ -319,14 +320,15 @@
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 = (
"$(inherited)",
"@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;
Expand Down
10 changes: 5 additions & 5 deletions example-app-spm/ios/App/CapApp-SPM/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
10 changes: 5 additions & 5 deletions example-app/android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
@@ -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')
12 changes: 6 additions & 6 deletions example-app/ios/App/Podfile
Original file line number Diff line number Diff line change
@@ -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!
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugin/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw there was a 11.0.0 release yesterday https://github.com/googlemaps/ios-maps-sdk/releases/tag/11.0.0, wondering if we should update now while we're at it.

But https://github.com/googlemaps/google-maps-ios-utils/releases/tag/v7.0.0 says it's using version 10 of SDK still, and the commit for 11.0.0 mentions release candidate, so not so sure if we should update 😅

What do you think?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd hold off on 11 for now. GoogleMapsUtils 7.1.0 declares from: "10.0.0" on the Maps SDK, which SPM resolves as < 11.0.0, so bumping to 11 would conflict with utils.

.package(url: "https://github.com/googlemaps/google-maps-ios-utils.git", .exact("7.1.0"))
],
targets: [
.target(
Expand Down
11 changes: 11 additions & 0 deletions plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
85 changes: 55 additions & 30 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading