Skip to content

Commit 80edf08

Browse files
authored
refactor(web): migrate Marker to AdvancedMarkerElement
1 parent fc87afd commit 80edf08

File tree

12 files changed

+189
-132
lines changed

12 files changed

+189
-132
lines changed

plugin/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,6 +1183,13 @@ but the current specification only allows X, Y, and (optionally) Z to be defined
11831183
<code>number[]</code>
11841184

11851185

1186+
#### Marker
1187+
1188+
Supports markers of either either "legacy" or "advanced" types.
1189+
1190+
<code>google.maps.<a href="#marker">Marker</a> | google.maps.marker.AdvancedMarkerElement</code>
1191+
1192+
11861193
### Enums
11871194

11881195

plugin/e2e-tests/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:theme="@style/AppTheme">
1212

1313
<activity
14-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
14+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
1515
android:name="io.ionic.starter.MainActivity"
1616
android:label="@string/title_activity_main"
1717
android:theme="@style/AppTheme.NoActionBarLaunch"

plugin/e2e-tests/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.2.2'
11-
classpath 'com.google.gms:google-services:4.3.15'
10+
classpath 'com.android.tools.build:gradle:8.7.2'
11+
classpath 'com.google.gms:google-services:4.4.2'
1212
classpath 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1'
1313

1414
// NOTE: Do not place your application dependencies here; they belong
-17.6 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

plugin/e2e-tests/android/gradlew

Lines changed: 21 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/e2e-tests/android/gradlew.bat

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/e2e-tests/android/variables.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ ext {
22
minSdkVersion = 23
33
compileSdkVersion = 35
44
targetSdkVersion = 35
5-
androidxActivityVersion = '1.8.0'
5+
androidxActivityVersion = '1.9.2'
66
androidxAppCompatVersion = '1.7.0'
77
androidxCoordinatorLayoutVersion = '1.2.0'
8-
androidxCoreVersion = '1.12.0'
9-
androidxFragmentVersion = '1.6.2'
10-
androidxWebkitVersion = '1.9.0'
8+
androidxCoreVersion = '1.15.0'
9+
androidxFragmentVersion = '1.8.4'
10+
androidxWebkitVersion = '1.12.1'
1111
androidxJunitVersion = '1.2.1'
1212
androidxEspressoCoreVersion = '3.6.1'
1313
cordovaAndroidVersion = '10.1.1'

plugin/e2e-tests/ios/App/App.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
298298
GCC_WARN_UNUSED_FUNCTION = YES;
299299
GCC_WARN_UNUSED_VARIABLE = YES;
300-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
300+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
301301
MTL_ENABLE_DEBUG_INFO = YES;
302302
ONLY_ACTIVE_ARCH = YES;
303303
SDKROOT = iphoneos;
@@ -348,7 +348,7 @@
348348
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
349349
GCC_WARN_UNUSED_FUNCTION = YES;
350350
GCC_WARN_UNUSED_VARIABLE = YES;
351-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
351+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
352352
MTL_ENABLE_DEBUG_INFO = NO;
353353
SDKROOT = iphoneos;
354354
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -364,7 +364,7 @@
364364
CODE_SIGN_STYLE = Automatic;
365365
DEVELOPMENT_TEAM = 9YN2HU59K8;
366366
INFOPLIST_FILE = App/Info.plist;
367-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
367+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
368368
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
369369
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
370370
PRODUCT_BUNDLE_IDENTIFIER = io.ionic.googlemaps;
@@ -383,7 +383,7 @@
383383
CODE_SIGN_STYLE = Automatic;
384384
DEVELOPMENT_TEAM = 9YN2HU59K8;
385385
INFOPLIST_FILE = App/Info.plist;
386-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
386+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
387387
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
388388
PRODUCT_BUNDLE_IDENTIFIER = io.ionic.googlemaps;
389389
PRODUCT_NAME = "$(TARGET_NAME)";

plugin/e2e-tests/package.json

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33
"version": "0.0.1",
44
"private": true,
55
"dependencies": {
6-
"@capacitor/android": "^6.0.0",
7-
"@capacitor/app": "^6.0.0",
8-
"@capacitor/core": "^6.0.0",
9-
"@capacitor/android": "next",
10-
"@capacitor/core": "next",
6+
"@capacitor/app": "^7.0.0",
7+
"@capacitor/android": "^7.0.0",
8+
"@capacitor/core": "^7.0.0",
119
"@capacitor/google-maps": "file:..",
12-
"@capacitor/haptics": "^6.0.0",
13-
"@capacitor/ios": "^6.0.0",
14-
"@capacitor/keyboard": "^6.0.0",
15-
"@capacitor/status-bar": "^6.0.0",
16-
"@capacitor/ios": "next",
10+
"@capacitor/haptics": "^7.0.0",
11+
"@capacitor/ios": "^7.0.0",
12+
"@capacitor/keyboard": "^7.0.0",
13+
"@capacitor/status-bar": "^7.0.0",
1714
"@ionic/react": "^6.0.0",
1815
"@ionic/react-router": "^6.0.0",
1916
"@testing-library/jest-dom": "^5.11.9",
@@ -80,11 +77,10 @@
8077
]
8178
},
8279
"devDependencies": {
83-
"@capacitor/cli": "^6.0.0",
80+
"@capacitor/cli": "^7.0.0",
8481
"@ionic/e2e": "0.2.0-next.6",
8582
"@ionic/e2e-components-ionic": "0.2.0-next.6",
86-
"@capacitor/cli": "next",
8783
"appium": "^1.22.1"
8884
},
8985
"description": "An Ionic project"
90-
}
86+
}

0 commit comments

Comments
 (0)