feat: Upgrade to selenium 4.35.0 (#2327)

BREAKING CHANGE: Removed all deprecated methods with Selenium's Location and LocationContext (these classes have been removed in Selenium 4.35.0)

Author: asolntsev

README.md

@@ -95,6 +95,7 @@ dependencies {
 ### Compatibility Matrix
  Appium Java Client                                                                                 | Selenium client
 ----------------------------------------------------------------------------------------------------|-----------------------------
+`10.0.0`                                                                                            | `4.35.0`
 `9.5.0`                                                                                             | `4.34.0`
 `9.4.0`                                                                                             | `4.26.0`, `4.27.0`, `4.28.0`, `4.28.1`, `4.29.0`, `4.30.0`, `4.31.0`, `4.32.0`, `4.33.0`
  `9.2.1`(known issues: appium/java-client#2145, appium/java-client#2146), `9.2.2`, `9.2.3`, `9.3.0` | `4.19.0`, `4.19.1`, `4.20.0`, `4.21.0`, `4.22.0`, `4.23.0`, `4.23.1`, `4.24.0`, `4.25.0`, `4.26.0`, `4.27.0`

build.gradle

@@ -188,7 +188,7 @@ jreleaser {
 }
 
 wrapper {
-    gradleVersion = '8.14'
+    gradleVersion = '8.14.3'
     distributionType = Wrapper.DistributionType.ALL
 }
 

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.daemon=true
 
-selenium.version=4.34.0
+selenium.version=4.35.0
 # Please increment the value in a release
 appiumClient.version=9.5.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/io/appium/java_client/AppiumDriver.java

@@ -44,7 +44,6 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.codec.w3c.W3CHttpResponseCodec;
-import org.openqa.selenium.remote.html5.RemoteLocationContext;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpMethod;
 
@@ -81,8 +80,6 @@ public class AppiumDriver extends RemoteWebDriver implements
     // frequently used command parameters
     @Getter
     private final URL remoteAddress;
-    @Deprecated(forRemoval = true)
-    protected final RemoteLocationContext locationContext;
     private final ExecuteMethod executeMethod;
     private final Set<String> absentExtensionNames = new HashSet<>();
     private URI biDiUri;
@@ -100,7 +97,6 @@ public class AppiumDriver extends RemoteWebDriver implements
     public AppiumDriver(HttpCommandExecutor executor, Capabilities capabilities) {
         super(executor, capabilities);
         this.executeMethod = new AppiumExecutionMethod(this);
-        locationContext = new RemoteLocationContext(executeMethod);
         super.setErrorHandler(ERROR_HANDLER);
         this.remoteAddress = executor.getAddressOfRemoteServer();
     }
@@ -176,7 +172,6 @@ public AppiumDriver(URL remoteSessionAddress, String platformName, String automa
         executor.setResponseCodec(new W3CHttpResponseCodec());
         setCommandExecutor(executor);
         this.executeMethod = new AppiumExecutionMethod(this);
-        this.locationContext = new RemoteLocationContext(executeMethod);
         super.setErrorHandler(ERROR_HANDLER);
         this.remoteAddress = executor.getAddressOfRemoteServer();
 

src/main/java/io/appium/java_client/android/AndroidDriver.java

@@ -43,7 +43,6 @@
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.HttpCommandExecutor;
-import org.openqa.selenium.remote.html5.RemoteLocationContext;
 import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.HttpClient;
 
@@ -251,20 +250,6 @@ public AndroidBatteryInfo getBatteryInfo() {
         return new AndroidBatteryInfo(CommandExecutionHelper.executeScript(this, "mobile: batteryInfo"));
     }
 
-    /**
-     * Provides the location context.
-     *
-     * @return instance of {@link RemoteLocationContext}
-     * @deprecated This method, {@link org.openqa.selenium.html5.LocationContext} and {@link RemoteLocationContext}
-     *     interface are deprecated, use {@link #getLocation()} and
-     *     {@link #setLocation(io.appium.java_client.Location)} instead.
-     */
-    @Override
-    @Deprecated(forRemoval = true)
-    public RemoteLocationContext getLocationContext() {
-        return locationContext;
-    }
-
     @Override
     public synchronized StringWebSocketClient getLogcatClient() {
         if (logcatClient == null) {

src/main/java/io/appium/java_client/ios/IOSDriver.java

@@ -44,7 +44,6 @@
 import org.openqa.selenium.remote.DriverCommand;
 import org.openqa.selenium.remote.HttpCommandExecutor;
 import org.openqa.selenium.remote.Response;
-import org.openqa.selenium.remote.html5.RemoteLocationContext;
 import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.HttpClient;
 
@@ -279,20 +278,6 @@ class IOSAlert implements Alert {
 
     }
 
-    /**
-     * Provides the location context.
-     *
-     * @return instance of {@link RemoteLocationContext}
-     * @deprecated This method, {@link org.openqa.selenium.html5.LocationContext} and {@link RemoteLocationContext}
-     *     interface are deprecated, use {@link #getLocation()} and
-     *     {@link #setLocation(io.appium.java_client.Location)} instead.
-     */
-    @Override
-    @Deprecated(forRemoval = true)
-    public RemoteLocationContext getLocationContext() {
-        return locationContext;
-    }
-
     @Override
     public synchronized StringWebSocketClient getSyslogClient() {
         if (syslogClient == null) {

src/main/java/io/appium/java_client/remote/SupportsLocation.java

@@ -18,50 +18,26 @@
 
 import io.appium.java_client.CommandExecutionHelper;
 import io.appium.java_client.ExecutesMethod;
+import io.appium.java_client.Location;
 import io.appium.java_client.MobileCommand;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.html5.Location;
-import org.openqa.selenium.html5.LocationContext;
-import org.openqa.selenium.remote.html5.RemoteLocationContext;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-public interface SupportsLocation extends WebDriver, ExecutesMethod, LocationContext {
-
-    /**
-     * Provides the location context.
-     *
-     * @return instance of {@link RemoteLocationContext}
-     * @deprecated This method, {@link LocationContext} and {@link RemoteLocationContext} interface are deprecated, use
-     *     {@link #getLocation()} and {@link #setLocation(io.appium.java_client.Location)} instead.
-     */
-    @Deprecated(forRemoval = true)
-    RemoteLocationContext getLocationContext();
-
-    /**
-     * Gets the current device's geolocation coordinates.
-     *
-     * @return A {@link Location} containing the location information. Returns null if the location is not available
-     * @deprecated This method and whole {@link LocationContext} interface are deprecated, use {@link #getLocation()}
-     *     instead.
-     */
-    @Deprecated(forRemoval = true)
-    default Location location() {
-        return getLocationContext().location();
-    }
+public interface SupportsLocation extends WebDriver, ExecutesMethod {
 
     /**
      * Gets the current device's geolocation coordinates.
      *
      * @return A {@link Location} containing the location information. Throws {@link WebDriverException} if the
      *     location is not available.
      */
-    default io.appium.java_client.Location getLocation() {
+    default Location getLocation() {
         Map<String, Number> result = CommandExecutionHelper.execute(this, MobileCommand.GET_LOCATION);
-        return new io.appium.java_client.Location(
+        return new Location(
                 result.get("latitude").doubleValue(),
                 result.get("longitude").doubleValue(),
                 Optional.ofNullable(result.get("altitude")).map(Number::doubleValue).orElse(null)
@@ -72,20 +48,8 @@ default io.appium.java_client.Location getLocation() {
      * Sets the current device's geolocation coordinates.
      *
      * @param location A {@link Location} containing the new location information.
-     * @deprecated This method and whole {@link LocationContext} interface are deprecated, use
-     *     {@link #setLocation(io.appium.java_client.Location)} instead.
      */
-    @Deprecated(forRemoval = true)
     default void setLocation(Location location) {
-        getLocationContext().setLocation(location);
-    }
-
-    /**
-     * Sets the current device's geolocation coordinates.
-     *
-     * @param location A {@link Location} containing the new location information.
-     */
-    default void setLocation(io.appium.java_client.Location location) {
         var locationParameters = new HashMap<String, Object>();
         locationParameters.put("latitude", location.getLatitude());
         locationParameters.put("longitude", location.getLongitude());