Skip to content

Commit 80edf08

Browse files
ItsChaceDItsChaceD
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

‎plugin/e2e-tests/android/gradle/wrapper/gradle-wrapper.jar‎

-17.6 KB
Binary file not shown.

‎plugin/e2e-tests/android/gradle/wrapper/gradle-wrapper.properties‎

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
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
8385
# This is normally unused
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -133,26 +134,29 @@ location of your Java installation."
133134
fi
134135
else
135136
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137140
138141
Please set the JAVA_HOME variable in your environment to match the
139142
location of your Java installation."
143+
fi
140144
fi
141145

142146
# Increase the maximum file descriptors if we can.
143147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
146150
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
151+
# shellcheck disable=SC2039,SC3045
148152
MAX_FD=$( ulimit -H -n ) ||
149153
warn "Could not query maximum file descriptor limit"
150154
esac
151155
case $MAX_FD in #(
152156
'' | soft) :;; #(
153157
*)
154158
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
159+
# shellcheck disable=SC2039,SC3045
156160
ulimit -n "$MAX_FD" ||
157161
warn "Could not set maximum file descriptor limit to $MAX_FD"
158162
esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
197201
done
198202
fi
199203

200-
# Collect all arguments for the java command;
201-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202-
# shell script including quotes and variable substitutions, so put them in
203-
# double quotes to make sure that they get re-expanded; and
204-
# * put everything else in single quotes, so that it's not re-expanded.
204+
205+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
206+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207+
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
205213

206214
set -- \
207215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

‎plugin/e2e-tests/android/gradlew.bat‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

‎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)