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
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1274,13 +1274,6 @@ Supports markers of either either "legacy" or "advanced" types.
<code>google.maps.<a href="#marker">Marker</a> | google.maps.marker.AdvancedMarkerElement</code>


#### Marker

Supports markers of either either "legacy" or "advanced" types.

<code>google.maps.<a href="#marker">Marker</a> | google.maps.marker.AdvancedMarkerElement</code>


### Enums


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: "7.4.1"),
.package(name: "CapacitorApp", path: "../../../../node_modules/.pnpm/@capacitor+app@7.1.0_@capacitor+core@7.4.1/node_modules/@capacitor/app"),
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.0.0-beta.0"),
.package(name: "CapacitorApp", path: "../../../../node_modules/.pnpm/@capacitor+app@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/app"),
.package(name: "CapacitorGoogleMaps", path: "../../../../plugin"),
.package(name: "CapacitorHaptics", path: "../../../../node_modules/.pnpm/@capacitor+haptics@7.0.2_@capacitor+core@7.4.1/node_modules/@capacitor/haptics"),
.package(name: "CapacitorKeyboard", path: "../../../../node_modules/.pnpm/@capacitor+keyboard@7.0.3_@capacitor+core@7.4.1/node_modules/@capacitor/keyboard"),
.package(name: "CapacitorStatusBar", path: "../../../../node_modules/.pnpm/@capacitor+status-bar@7.0.3_@capacitor+core@7.4.1/node_modules/@capacitor/status-bar")
.package(name: "CapacitorHaptics", path: "../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0-next.2_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/haptics"),
.package(name: "CapacitorKeyboard", path: "../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0-next.3_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/keyboard"),
.package(name: "CapacitorStatusBar", path: "../../../../node_modules/.pnpm/@capacitor+status-bar@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/status-bar")
],
targets: [
.target(
Expand Down
16 changes: 8 additions & 8 deletions example-app-spm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"version": "0.0.2",
"private": true,
"dependencies": {
"@capacitor/android": "^7.0.0",
"@capacitor/app": "^7.0.0",
"@capacitor/core": "^7.0.0",
"@capacitor/android": "next",
"@capacitor/app": "next",
"@capacitor/core": "next",
"@capacitor/google-maps": "workspace:*",
"@capacitor/haptics": "^7.0.0",
"@capacitor/ios": "^7.0.0",
"@capacitor/keyboard": "^7.0.0",
"@capacitor/status-bar": "^7.0.0",
"@capacitor/haptics": "next",
"@capacitor/ios": "next",
"@capacitor/keyboard": "next",
"@capacitor/status-bar": "next",
"@ionic/react": "^6.0.0",
"@ionic/react-router": "^6.0.0",
"@testing-library/jest-dom": "^5.11.9",
Expand Down Expand Up @@ -69,7 +69,7 @@
]
},
"devDependencies": {
"@capacitor/cli": "^7.0.0"
"@capacitor/cli": "next"
},
"description": "An Ionic project"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ci:publish:dev": "lerna publish prerelease --conventional-commits --conventional-prerelease --preid dev-$(date +\"%Y%m%dT%H%M%S\") --force-publish --no-changelog --no-git-tag-version --dist-tag dev --no-push --yes"
},
"devDependencies": {
"@capacitor/ios": ">=7.0.0",
"@capacitor/ios": "next",
"@types/node": "^20.11.25",
"glob": "^11.0.0",
"husky": "^9.0.1",
Expand Down
2 changes: 1 addition & 1 deletion plugin/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let package = Package(
targets: ["CapacitorGoogleMapsPlugin"])
],
dependencies: [
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0-beta"),
.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"))
],
Expand Down
16 changes: 8 additions & 8 deletions plugin/e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"version": "0.0.1",
"private": true,
"dependencies": {
"@capacitor/app": "^7.0.0",
"@capacitor/android": "^7.0.0",
"@capacitor/core": "^7.0.0",
"@capacitor/app": "next",
"@capacitor/android": "next",
"@capacitor/core": "next",
"@capacitor/google-maps": "file:..",
"@capacitor/haptics": "^7.0.0",
"@capacitor/ios": "^7.0.0",
"@capacitor/keyboard": "^7.0.0",
"@capacitor/status-bar": "^7.0.0",
"@capacitor/haptics": "next",
"@capacitor/ios": "next",
"@capacitor/keyboard": "next",
"@capacitor/status-bar": "next",
"@ionic/react": "^6.0.0",
"@ionic/react-router": "^6.0.0",
"@testing-library/jest-dom": "^5.11.9",
Expand Down Expand Up @@ -77,7 +77,7 @@
]
},
"devDependencies": {
"@capacitor/cli": "^7.0.0",
"@capacitor/cli": "next",
"@ionic/e2e": "0.2.0-next.6",
"@ionic/e2e-components-ionic": "0.2.0-next.6",
"appium": "^1.22.1"
Expand Down
8 changes: 4 additions & 4 deletions plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"unittest:android": "cd ./unit-tests/android && ./gradlew testDebugUnitTest"
},
"devDependencies": {
"@capacitor/android": ">=7.0.0",
"@capacitor/core": ">=7.0.0",
"@capacitor/android": "next",
"@capacitor/core": "next",
"@capacitor/docgen": "0.3.0",
"@capacitor/ios": ">=7.0.0",
"@capacitor/ios": "next",
"@ionic/prettier-config": "^1.0.1",
"@types/resize-observer-browser": "^0.1.7",
"@types/supercluster": "^7.1.0",
Expand All @@ -77,7 +77,7 @@
"typescript": "^5.4.2"
},
"peerDependencies": {
"@capacitor/core": ">=7.0.0"
"@capacitor/core": "next"
},
"capacitor": {
"ios": {
Expand Down
Loading