Skip to content

Commit 29843c1

Browse files
authored
build: Bump build dependencies (#2291)
* build: Bump Gradle from `8.9` to `8.14` * build: Bump JaCoCo from `0.8.12` to `0.8.13` * build: Bump Checkstyle from `10.17.0` to `10.23.1` * fix: Fix Checkstyle violations in Javadocs New Checkstyle versions introduced a number of improvements/fixes in Javadocs checks, that resulted in new violations reported. * fix: Fix typo in Javadocs
1 parent 5560a56 commit 29843c1

File tree

18 files changed

+66
-45
lines changed

18 files changed

+66
-45
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dependencyCheck {
7575
}
7676

7777
jacoco {
78-
toolVersion = '0.8.12'
78+
toolVersion = '0.8.13'
7979
}
8080

8181
tasks.withType(JacocoReport).configureEach {
@@ -91,7 +91,7 @@ jacocoTestReport.dependsOn test
9191
apply plugin: 'checkstyle'
9292

9393
checkstyle {
94-
toolVersion = '10.17.0'
94+
toolVersion = '10.23.1'
9595
configFile = configDirectory.file('appium-style.xml').get().getAsFile()
9696
showViolations = true
9797
ignoreFailures = false
@@ -180,7 +180,7 @@ signing {
180180
}
181181

182182
wrapper {
183-
gradleVersion = '8.9'
183+
gradleVersion = '8.14'
184184
distributionType = Wrapper.DistributionType.ALL
185185
}
186186

gradle/wrapper/gradle-wrapper.jar

260 Bytes
Binary file not shown.

gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# 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
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

src/e2eAndroidTest/java/io/appium/java_client/service/local/ServerBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ServerBuilderTest {
5050
private static final String PATH_TO_APPIUM_NODE_IN_PROPERTIES = getProperty(APPIUM_PATH);
5151

5252
/**
53-
* This is the path to the stub main.js file
53+
* This is the path to the stub main.js file.
5454
*/
5555
private static final Path PATH_T0_TEST_MAIN_JS = TestUtils.resourcePathToAbsolutePath("main.js");
5656

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ public static By androidDataMatcher(final String dataMatcherString) {
8484
}
8585

8686
/**
87-
* Refer to https://developer.android.com/training/testing/ui-automator
87+
* Refer to <a href="https://developer.android.com/training/testing/ui-automator">UI Automator</a> .
8888
*
8989
* @param uiautomatorText is Android UIAutomator string
90-
* @return an instance of {@link AppiumBy.ByAndroidUIAutomator}
90+
* @return an instance of {@link ByAndroidUIAutomator}
9191
*/
9292
public static By androidUIAutomator(final String uiautomatorText) {
9393
return new ByAndroidUIAutomator(uiautomatorText);
@@ -169,9 +169,9 @@ public static By custom(final String selector) {
169169
* as for OpenCV library.
170170
* @return an instance of {@link ByImage}
171171
* @see <a href="https://github.com/appium/appium/blob/master/docs/en/writing-running-appium/image-comparison.md">
172-
* The documentation on Image Comparison Features</a>
172+
* The documentation on Image Comparison Features</a>
173173
* @see <a href="https://github.com/appium/appium-base-driver/blob/master/lib/basedriver/device-settings.js">
174-
* The settings available for lookup fine-tuning</a>
174+
* The settings available for lookup fine-tuning</a>
175175
* @since Appium 1.8.2
176176
*/
177177
public static By image(final String b64Template) {

src/main/java/io/appium/java_client/android/nativekey/KeyEventMetaModifier.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,103 +23,103 @@ public enum KeyEventMetaModifier {
2323
*/
2424
SELECTING(0x800),
2525
/**
26-
* <p>This mask is used to check whether one of the ALT meta keys is pressed.</p>
26+
* This mask is used to check whether one of the ALT meta keys is pressed.
2727
*
2828
* @see AndroidKey#ALT_LEFT
2929
* @see AndroidKey#ALT_RIGHT
3030
*/
3131
ALT_ON(0x02),
3232
/**
33-
* <p>This mask is used to check whether the left ALT meta key is pressed.</p>
33+
* This mask is used to check whether the left ALT meta key is pressed.
3434
*
3535
* @see AndroidKey#ALT_LEFT
3636
*/
3737
ALT_LEFT_ON(0x10),
3838
/**
39-
* <p>This mask is used to check whether the right the ALT meta key is pressed.</p>
39+
* This mask is used to check whether the right the ALT meta key is pressed.
4040
*
4141
* @see AndroidKey#ALT_RIGHT
4242
*/
4343
ALT_RIGHT_ON(0x20),
4444
/**
45-
* <p>This mask is used to check whether one of the SHIFT meta keys is pressed.</p>
45+
* This mask is used to check whether one of the SHIFT meta keys is pressed.
4646
*
4747
* @see AndroidKey#SHIFT_LEFT
4848
* @see AndroidKey#SHIFT_RIGHT
4949
*/
5050
SHIFT_ON(0x1),
5151
/**
52-
* <p>This mask is used to check whether the left SHIFT meta key is pressed.</p>
52+
* This mask is used to check whether the left SHIFT meta key is pressed.
5353
*
5454
* @see AndroidKey#SHIFT_LEFT
5555
*/
5656
SHIFT_LEFT_ON(0x40),
5757
/**
58-
* <p>This mask is used to check whether the right SHIFT meta key is pressed.</p>
58+
* This mask is used to check whether the right SHIFT meta key is pressed.
5959
*
6060
* @see AndroidKey#SHIFT_RIGHT
6161
*/
6262
SHIFT_RIGHT_ON(0x80),
6363
/**
64-
* <p>This mask is used to check whether the SYM meta key is pressed.</p>
64+
* This mask is used to check whether the SYM meta key is pressed.
6565
*/
6666
SYM_ON(0x4),
6767
/**
68-
* <p>This mask is used to check whether the FUNCTION meta key is pressed.</p>
68+
* This mask is used to check whether the FUNCTION meta key is pressed.
6969
*/
7070
FUNCTION_ON(0x8),
7171
/**
72-
* <p>This mask is used to check whether one of the CTRL meta keys is pressed.</p>
72+
* This mask is used to check whether one of the CTRL meta keys is pressed.
7373
*
7474
* @see AndroidKey#CTRL_LEFT
7575
* @see AndroidKey#CTRL_RIGHT
7676
*/
7777
CTRL_ON(0x1000),
7878
/**
79-
* <p>This mask is used to check whether the left CTRL meta key is pressed.</p>
79+
* This mask is used to check whether the left CTRL meta key is pressed.
8080
*
8181
* @see AndroidKey#CTRL_LEFT
8282
*/
8383
CTRL_LEFT_ON(0x2000),
8484
/**
85-
* <p>This mask is used to check whether the right CTRL meta key is pressed.</p>
85+
* This mask is used to check whether the right CTRL meta key is pressed.
8686
*
8787
* @see AndroidKey#CTRL_RIGHT
8888
*/
8989
CTRL_RIGHT_ON(0x4000),
9090
/**
91-
* <p>This mask is used to check whether one of the META meta keys is pressed.</p>
91+
* This mask is used to check whether one of the META meta keys is pressed.
9292
*
9393
* @see AndroidKey#META_LEFT
9494
* @see AndroidKey#META_RIGHT
9595
*/
9696
META_ON(0x10000),
9797
/**
98-
* <p>This mask is used to check whether the left META meta key is pressed.</p>
98+
* This mask is used to check whether the left META meta key is pressed.
9999
*
100100
* @see AndroidKey#META_LEFT
101101
*/
102102
META_LEFT_ON(0x20000),
103103
/**
104-
* <p>This mask is used to check whether the right META meta key is pressed.</p>
104+
* This mask is used to check whether the right META meta key is pressed.
105105
*
106106
* @see AndroidKey#META_RIGHT
107107
*/
108108
META_RIGHT_ON(0x40000),
109109
/**
110-
* <p>This mask is used to check whether the CAPS LOCK meta key is on.</p>
110+
* This mask is used to check whether the CAPS LOCK meta key is on.
111111
*
112112
* @see AndroidKey#CAPS_LOCK
113113
*/
114114
CAPS_LOCK_ON(0x100000),
115115
/**
116-
* <p>This mask is used to check whether the NUM LOCK meta key is on.</p>
116+
* This mask is used to check whether the NUM LOCK meta key is on.
117117
*
118118
* @see AndroidKey#NUM_LOCK
119119
*/
120120
NUM_LOCK_ON(0x200000),
121121
/**
122-
* <p>This mask is used to check whether the SCROLL LOCK meta key is on.</p>
122+
* This mask is used to check whether the SCROLL LOCK meta key is on.
123123
*
124124
* @see AndroidKey#SCROLL_LOCK
125125
*/

src/main/java/io/appium/java_client/android/options/EspressoOptions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@
101101
import java.util.Map;
102102

103103
/**
104-
* https://github.com/appium/appium-espresso-driver#capabilities
104+
* Provides options specific to the Espresso Driver.
105+
*
106+
* <p>For more details, refer to the
107+
* <a href="https://github.com/appium/appium-espresso-driver#capabilities">capabilities documentation</a></p>
105108
*/
106109
public class EspressoOptions extends BaseOptions<EspressoOptions> implements
107110
// General options: https://github.com/appium/appium-uiautomator2-driver#general

src/main/java/io/appium/java_client/android/options/UiAutomator2Options.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,10 @@
107107
import java.util.Map;
108108

109109
/**
110-
* https://github.com/appium/appium-uiautomator2-driver#capabilities
110+
* Provides options specific to the UiAutomator2 Driver.
111+
*
112+
* <p>For more details, refer to the
113+
* <a href="https://github.com/appium/appium-uiautomator2-driver#capabilities">capabilities documentation</a></p>
111114
*/
112115
public class UiAutomator2Options extends BaseOptions<UiAutomator2Options> implements
113116
// General options: https://github.com/appium/appium-uiautomator2-driver#general

src/main/java/io/appium/java_client/chromium/ChromiumDriver.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@
2929
import java.net.URL;
3030

3131
/**
32-
* <p>ChromiumDriver is an officially supported Appium driver created to automate Mobile browsers
32+
* ChromiumDriver is an officially supported Appium driver created to automate Mobile browsers
3333
* and web views based on the Chromium engine. The driver uses W3CWebDriver protocol and is built
34-
* on top of chromium driver server.</p>
34+
* on top of chromium driver server.
3535
* <br>
36+
*
3637
* <p>Read <a href='https://github.com/appium/appium-chromium-driver'>appium-chromium-driver</a>
3738
* for more details on how to configure and use it.</p>
3839
*/

src/main/java/io/appium/java_client/chromium/options/ChromiumOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.Map;
2525

2626
/**
27-
* <p>Options class that sets options for Chromium when testing websites.</p>
27+
* Options class that sets options for Chromium when testing websites.
2828
* <br>
2929
* @see <a href='https://github.com/appium/appium-chromium-driver#usage'>appium-chromium-driver usage section</a>
3030
*/

src/main/java/io/appium/java_client/flutter/FlutterDriverOptions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
import java.util.Map;
1414

1515
/**
16-
* https://github.com/AppiumTestDistribution/appium-flutter-integration-driver#capabilities-for-appium-flutter-integration-driver
16+
* Provides options specific to the Appium Flutter Integration Driver.
17+
*
18+
* <p>For more details, refer to the
19+
* <a href="https://github.com/AppiumTestDistribution/appium-flutter-integration-driver#capabilities-for-appium-flutter-integration-driver">capabilities documentation</a></p>
1720
*/
1821
public class FlutterDriverOptions extends BaseOptions<FlutterDriverOptions> implements
1922
SupportsFlutterSystemPortOption<FlutterDriverOptions>,

src/main/java/io/appium/java_client/flutter/FlutterIntegrationTestDriver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* Flutter applications, extending WebDriver and providing additional capabilities for
88
* interacting with Flutter-specific elements and behaviors.
99
*
10-
* <p> This interface serves as a common entity for drivers that support Flutter applications
11-
* on different platforms, such as Android and iOS. </p>
10+
* <p>This interface serves as a common entity for drivers that support Flutter applications
11+
* on different platforms, such as Android and iOS.</p>
1212
*
1313
* @see WebDriver
1414
* @see SupportsGestureOnFlutterElements

src/main/java/io/appium/java_client/gecko/options/GeckoOptions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
import java.util.Map;
3232

3333
/**
34-
* https://github.com/appium/appium-geckodriver#usage
34+
* Provides options specific to the Geckodriver.
35+
*
36+
* <p>For more details, refer to the
37+
* <a href="https://github.com/appium/appium-geckodriver#capabilities">capabilities documentation</a></p>
3538
*/
3639
public class GeckoOptions extends BaseOptions<GeckoOptions> implements
3740
SupportsBrowserNameOption<GeckoOptions>,

src/main/java/io/appium/java_client/ios/options/XCUITestOptions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,10 @@
119119
import java.util.Map;
120120

121121
/**
122-
* https://github.com/appium/appium-xcuitest-driver#capabilities
122+
* Provides options specific to the XCUITest Driver.
123+
*
124+
* <p>For more details, refer to the
125+
* <a href="https://appium.github.io/appium-xcuitest-driver/latest/reference/capabilities/">capabilities documentation</a></p>
123126
*/
124127
public class XCUITestOptions extends BaseOptions<XCUITestOptions> implements
125128
// General options: https://github.com/appium/appium-xcuitest-driver#general

src/main/java/io/appium/java_client/mac/options/Mac2Options.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
import java.util.Optional;
2828

2929
/**
30-
* https://github.com/appium/appium-mac2-driver#capabilities
30+
* Provides options specific to the Appium Mac2 Driver.
31+
*
32+
* <p>For more details, refer to the
33+
* <a href="https://github.com/appium/appium-mac2-driver#capabilities">capabilities documentation</a></p>
3134
*/
3235
public class Mac2Options extends BaseOptions<Mac2Options> implements
3336
SupportsSystemPortOption<Mac2Options>,

src/main/java/io/appium/java_client/safari/options/SafariOptions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
import java.util.Map;
3232

3333
/**
34-
* https://github.com/appium/appium-safari-driver#usage
34+
* Provides options specific to the Safari Driver.
35+
*
36+
* <p>For more details, refer to the
37+
* <a href="https://github.com/appium/appium-safari-driver#usage">capabilities documentation</a></p>
3538
*/
3639
public class SafariOptions extends BaseOptions<SafariOptions> implements
3740
SupportsBrowserNameOption<SafariOptions>,

src/main/java/io/appium/java_client/windows/options/WindowsOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Optional;
2929

3030
/**
31-
* <a href="https://github.com/appium/appium-windows-driver#usage">https://github.com/appium/appium-windows-driver#usage</a>
31+
* <a href="https://github.com/appium/appium-windows-driver#usage">https://github.com/appium/appium-windows-driver#usage</a>.
3232
*/
3333
public class WindowsOptions extends BaseOptions<WindowsOptions> implements
3434
SupportsAppOption<WindowsOptions>,

0 commit comments

Comments
 (0)