Skip to content

Commit 38bb5c2

Browse files
authored
Update to Appium 9.2.3 and Selenium 4.22.0 (#43)
Update device and driver settings to use BaseOptions instead of Capabilities (in accordance with changes introduced in latest version, see appium/java-client#2184)
1 parent 3d6cc65 commit 38bb5c2

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,19 +189,19 @@
189189
<dependency>
190190
<groupId>com.github.aquality-automation</groupId>
191191
<artifactId>aquality-selenium-core</artifactId>
192-
<version>4.0.2</version>
192+
<version>4.0.3</version>
193193
</dependency>
194194

195195
<dependency>
196196
<groupId>io.appium</groupId>
197197
<artifactId>java-client</artifactId>
198-
<version>9.2.2</version>
198+
<version>9.2.3</version>
199199
</dependency>
200200

201201
<dependency>
202202
<groupId>org.testng</groupId>
203203
<artifactId>testng</artifactId>
204-
<version>7.9.0</version>
204+
<version>7.10.2</version>
205205
<scope>test</scope>
206206
</dependency>
207207

@@ -215,7 +215,7 @@
215215
<dependency>
216216
<groupId>commons-io</groupId>
217217
<artifactId>commons-io</artifactId>
218-
<version>2.15.1</version>
218+
<version>2.16.1</version>
219219
<scope>test</scope>
220220
</dependency>
221221

src/main/java/aquality/appium/mobile/configuration/DeviceSettings.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
import aquality.selenium.core.utilities.ISettingsFile;
44
import aquality.selenium.core.utilities.JsonSettingsFile;
5-
import org.openqa.selenium.Capabilities;
6-
import org.openqa.selenium.remote.DesiredCapabilities;
5+
import io.appium.java_client.remote.options.BaseOptions;
76

87
import java.util.HashMap;
98
import java.util.Map;
@@ -27,9 +26,9 @@ private ISettingsFile getDevicesSettingsFile() {
2726
}
2827

2928
@Override
30-
public Capabilities getCapabilities() {
29+
public BaseOptions<?> getCapabilities() {
3130
Map<String, Object> deviceCapabilities = getCapabilitiesFromSettings();
32-
DesiredCapabilities capabilities = new DesiredCapabilities();
31+
BaseOptions<?> capabilities = new BaseOptions<>();
3332
deviceCapabilities.forEach(capabilities::setCapability);
3433
return capabilities;
3534
}

src/main/java/aquality/appium/mobile/configuration/DriverSettings.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import aquality.appium.mobile.application.PlatformName;
55
import aquality.selenium.core.localization.ILocalizationManager;
66
import aquality.selenium.core.utilities.ISettingsFile;
7-
import org.openqa.selenium.Capabilities;
8-
import org.openqa.selenium.remote.DesiredCapabilities;
7+
import io.appium.java_client.remote.options.BaseOptions;
98

109
import java.io.File;
1110
import java.io.IOException;
@@ -29,9 +28,9 @@ public DriverSettings(ISettingsFile settingsFile, PlatformName platformName) {
2928
}
3029

3130
@Override
32-
public Capabilities getCapabilities() {
31+
public BaseOptions<?> getCapabilities() {
3332
Map<String, Object> capabilitiesFromSettings = getCapabilitiesFromSettings();
34-
DesiredCapabilities capabilities = new DesiredCapabilities();
33+
BaseOptions<?> capabilities = new BaseOptions<>();
3534
capabilitiesFromSettings.forEach((key, value) -> {
3635
if (key.toLowerCase().endsWith("options")) {
3736
value = settingsFile.getMap(getDriverSettingsPath(CAPABILITIES, key));
@@ -68,7 +67,7 @@ private boolean hasApplicationPath() {
6867
return settingsFile.getMap(getDriverSettingsPath()).containsKey(APPLICATION_PATH_KEY) || getDeviceCapabilities().is(APP_CAPABILITY_KEY);
6968
}
7069

71-
private Capabilities getDeviceCapabilities() {
70+
private BaseOptions<?> getDeviceCapabilities() {
7271
String deviceKey = (String) settingsFile.getValueOrDefault(getDriverSettingsPath(DEVICE_KEY_KEY), null);
7372
IDeviceSettings deviceSettings = new DeviceSettings(deviceKey);
7473
return deviceSettings.getCapabilities();
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package aquality.appium.mobile.configuration;
22

3-
import org.openqa.selenium.Capabilities;
3+
import io.appium.java_client.remote.options.BaseOptions;
44

55
/**
66
* Describes desired device settings.
@@ -9,7 +9,7 @@ public interface IDeviceSettings {
99

1010
/**
1111
* Capabilities related to desired device.
12-
* @return initialized {@link Capabilities}.
12+
* @return initialized {@link BaseOptions}.
1313
*/
14-
Capabilities getCapabilities();
14+
BaseOptions<?> getCapabilities();
1515
}

src/main/java/aquality/appium/mobile/configuration/IDriverSettings.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package aquality.appium.mobile.configuration;
22

3-
import org.openqa.selenium.Capabilities;
3+
import io.appium.java_client.remote.options.BaseOptions;
44

55
/**
66
* Describes AppiumDriver settings.
@@ -9,9 +9,9 @@ public interface IDriverSettings {
99

1010
/**
1111
* Gets appium driver capabilities.
12-
* @return initialized {@link Capabilities}.
12+
* @return initialized {@link BaseOptions}.
1313
*/
14-
Capabilities getCapabilities();
14+
BaseOptions<?> getCapabilities();
1515

1616
/**
1717
* Provides a path to the application.

0 commit comments

Comments
 (0)