From bc13cc283ad1d11812433228fd81602ec379c6ee Mon Sep 17 00:00:00 2001
From: eyaly <eyal.yovel@saucelabs.com>
Date: Sun, 19 Nov 2023 11:56:15 +0000
Subject: [PATCH] Amend Appium version to 9.0.0 (#162)

* Amend Appium version to 9.0.0

* Change JDK 8 to 11
---
 .github/workflows/best-practice.yml           |  4 +--
 .github/workflows/mac-windows.yml             |  4 +--
 .github/workflows/real-devices.yml            |  4 +--
 .../workflows/selenium-cucumber-examples.yml  |  4 +--
 .github/workflows/testng.yml                  |  4 +--
 appium-junit4-cucumber-examples/pom.xml       | 12 +++++++
 .../appium-app-best-practice/pom.xml          | 34 ++++++++++++++++++-
 appium/appium-app/appium-app-examples/pom.xml | 34 ++++++++++++++++++-
 .../MidSessionAppInstallsAndroidTest.java     |  2 +-
 .../up_download_file/SamsungGallery.java      |  7 ++--
 appium/appium-web/appium-web-examples/pom.xml | 32 ++++++++++++++++-
 best-practice/pom.xml                         | 10 +++++-
 gitpod/pom.xml                                | 14 +++++++-
 pom.xml                                       | 10 +-----
 14 files changed, 148 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/best-practice.yml b/.github/workflows/best-practice.yml
index 21605db7..250edae3 100644
--- a/.github/workflows/best-practice.yml
+++ b/.github/workflows/best-practice.yml
@@ -16,10 +16,10 @@ jobs:
         os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Run tests
       continue-on-error: true
       env:
diff --git a/.github/workflows/mac-windows.yml b/.github/workflows/mac-windows.yml
index c6c0c94c..484005b1 100644
--- a/.github/workflows/mac-windows.yml
+++ b/.github/workflows/mac-windows.yml
@@ -16,10 +16,10 @@ jobs:
         os: [windows-latest, macos-latest]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Run tests
       continue-on-error: true
       env:
diff --git a/.github/workflows/real-devices.yml b/.github/workflows/real-devices.yml
index d110dfe7..614f02be 100644
--- a/.github/workflows/real-devices.yml
+++ b/.github/workflows/real-devices.yml
@@ -19,10 +19,10 @@ jobs:
         os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: RDC Native App Android
       run: mvn test -pl appium/appium-app/appium-app-examples -Dtest=AndroidNativeAppTest -Dregion=eu -X
     - name: RDC Native App IOS
diff --git a/.github/workflows/selenium-cucumber-examples.yml b/.github/workflows/selenium-cucumber-examples.yml
index f5a50f85..96af70b7 100644
--- a/.github/workflows/selenium-cucumber-examples.yml
+++ b/.github/workflows/selenium-cucumber-examples.yml
@@ -16,10 +16,10 @@ jobs:
         os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Run tests
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
diff --git a/.github/workflows/testng.yml b/.github/workflows/testng.yml
index 45285b24..04c4a481 100644
--- a/.github/workflows/testng.yml
+++ b/.github/workflows/testng.yml
@@ -16,10 +16,10 @@ jobs:
         os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up Java
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Run testng tests
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
diff --git a/appium-junit4-cucumber-examples/pom.xml b/appium-junit4-cucumber-examples/pom.xml
index 5217e9f9..cf24e99f 100644
--- a/appium-junit4-cucumber-examples/pom.xml
+++ b/appium-junit4-cucumber-examples/pom.xml
@@ -10,6 +10,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <appium.version>9.0.0</appium.version>
+    </properties>
+
     <artifactId>appium-junit4-cucumber-examples</artifactId>
     <dependencies>
     <!--        Appium dependency is in project level POM.xml -->
@@ -26,5 +30,13 @@
             <version>7.3.3</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.appium</groupId>
+            <artifactId>java-client</artifactId>
+            <version>${appium.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/appium/appium-app/appium-app-best-practice/pom.xml b/appium/appium-app/appium-app-best-practice/pom.xml
index 39f78914..6f06a37b 100644
--- a/appium/appium-app/appium-app-best-practice/pom.xml
+++ b/appium/appium-app/appium-app-best-practice/pom.xml
@@ -16,7 +16,8 @@
         <testngXmlDir>src/test/resources/config</testngXmlDir>
         <testngXmlFile>myDemoTests.xml</testngXmlFile>
         <testng.version>7.5</testng.version>
-        <appium.version>8.3.0</appium.version>
+        <appium.version>9.0.0</appium.version>
+        <selenium.version>4.14.1</selenium.version>
     </properties>
 
     <dependencies>
@@ -32,12 +33,43 @@
             <version>3.10.0</version>
         </dependency>
 
+
         <dependency>
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
             <version>${appium.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-remote-driver</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-support</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-api</artifactId>
+            <version>${selenium.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-remote-driver</artifactId>
+            <version>${selenium.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-support</artifactId>
+            <version>${selenium.version}</version>
         </dependency>
+
     </dependencies>
 
     <build>
diff --git a/appium/appium-app/appium-app-examples/pom.xml b/appium/appium-app/appium-app-examples/pom.xml
index 14b86e4c..7671e4ab 100644
--- a/appium/appium-app/appium-app-examples/pom.xml
+++ b/appium/appium-app/appium-app-examples/pom.xml
@@ -14,7 +14,8 @@
 
     <properties>
         <maven.surefire.version>3.0.0-M5</maven.surefire.version>
-        <appium.version>8.6.0</appium.version>
+        <appium.version>9.0.0</appium.version>
+        <selenium.version>4.14.1</selenium.version>
     </properties>
 
     <!--    You will find Junit and Appium configration in the project level pom.xml -->
@@ -33,13 +34,44 @@
             <version>3.10.0</version>
         </dependency>
 
+
         <dependency>
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
             <version>${appium.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-remote-driver</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-support</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-api</artifactId>
+            <version>${selenium.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-remote-driver</artifactId>
+            <version>${selenium.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-support</artifactId>
+            <version>${selenium.version}</version>
         </dependency>
 
+
     </dependencies>
     <build>
         <plugins>
diff --git a/appium/appium-app/appium-app-examples/src/test/java/com/examples/mid_session_app_installs/MidSessionAppInstallsAndroidTest.java b/appium/appium-app/appium-app-examples/src/test/java/com/examples/mid_session_app_installs/MidSessionAppInstallsAndroidTest.java
index aa9c63e6..7f122a20 100644
--- a/appium/appium-app/appium-app-examples/src/test/java/com/examples/mid_session_app_installs/MidSessionAppInstallsAndroidTest.java
+++ b/appium/appium-app/appium-app-examples/src/test/java/com/examples/mid_session_app_installs/MidSessionAppInstallsAndroidTest.java
@@ -97,7 +97,7 @@ public void upgradeAppInMidSession() throws MalformedURLException {
         navigateToAbout();
 
         // Install a new version
-        var results = driver.executeScript("mobile:installApp", ImmutableMap.of("appPath", "storage:filename=mda-1.0.17-20.apk"));
+        Object results = driver.executeScript("mobile:installApp", ImmutableMap.of("appPath", "storage:filename=mda-1.0.17-20.apk"));
         System.out.println(results);
 
         // Launch the new app
diff --git a/appium/appium-app/appium-app-examples/src/test/java/com/examples/up_download_file/SamsungGallery.java b/appium/appium-app/appium-app-examples/src/test/java/com/examples/up_download_file/SamsungGallery.java
index fa126745..6d275136 100644
--- a/appium/appium-app/appium-app-examples/src/test/java/com/examples/up_download_file/SamsungGallery.java
+++ b/appium/appium-app/appium-app-examples/src/test/java/com/examples/up_download_file/SamsungGallery.java
@@ -1,5 +1,6 @@
 package com.examples.up_download_file;
 
+import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.android.Activity;
 import io.appium.java_client.android.AndroidDriver;
 import org.openqa.selenium.By;
@@ -24,8 +25,10 @@ public SamsungGallery(AndroidDriver driver) {
     }
 
     public void open() {
-        driver.startActivity(new Activity("com.sec.android.gallery3d", "com.samsung.android.gallery.app.activity.GalleryActivity"));
-
+        driver.executeScript("mobile: startActivity", ImmutableMap.of(
+                "appPackage", "com.sec.android.gallery3d",
+                "appActivity", "com.samsung.android.gallery.app.activity.GalleryActivity"
+        ));
     }
 
     public void openPhoto(String which){
diff --git a/appium/appium-web/appium-web-examples/pom.xml b/appium/appium-web/appium-web-examples/pom.xml
index 65f6a9df..17364880 100644
--- a/appium/appium-web/appium-web-examples/pom.xml
+++ b/appium/appium-web/appium-web-examples/pom.xml
@@ -14,7 +14,8 @@
 
     <properties>
         <maven.surefire.version>3.0.0-M5</maven.surefire.version>
-        <appium.version>8.3.0</appium.version>
+        <appium.version>9.0.0</appium.version>
+        <selenium.version>4.14.1</selenium.version>
     </properties>
 
     <!--    You will find Junit and Appium configration in the project level pom.xml -->
@@ -38,6 +39,35 @@
             <artifactId>java-client</artifactId>
             <version>${appium.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-remote-driver</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-support</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-api</artifactId>
+            <version>${selenium.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-remote-driver</artifactId>
+            <version>${selenium.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-support</artifactId>
+            <version>${selenium.version}</version>
         </dependency>
 
     </dependencies>
diff --git a/best-practice/pom.xml b/best-practice/pom.xml
index de5e46ad..8222ba4b 100644
--- a/best-practice/pom.xml
+++ b/best-practice/pom.xml
@@ -12,7 +12,8 @@
     <artifactId>best-practice</artifactId>
 
     <properties>
-        <selenium.version>4.10.0</selenium.version>
+        <selenium.version>4.14.1</selenium.version>
+        <appium.version>9.0.0</appium.version>
     </properties>
 
     <dependencies>
@@ -35,6 +36,13 @@
             <version>${selenium.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.appium</groupId>
+            <artifactId>java-client</artifactId>
+            <version>${appium.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/gitpod/pom.xml b/gitpod/pom.xml
index 850d5007..1a925d07 100644
--- a/gitpod/pom.xml
+++ b/gitpod/pom.xml
@@ -11,6 +11,12 @@
 
     <artifactId>gitpod</artifactId>
 
+    <properties>
+        <maven.surefire.version>3.0.0-M5</maven.surefire.version>
+        <appium.version>9.0.0</appium.version>
+        <selenium.version>4.14.1</selenium.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.saucelabs</groupId>
@@ -21,7 +27,13 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>4.11.0</version>
+            <version>${selenium.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.appium</groupId>
+            <artifactId>java-client</artifactId>
+            <version>${appium.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 3c2b1905..a70c904a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <selenium.version>4.10.0</selenium.version>
-        <appium.version>8.3.0</appium.version>
+        <selenium.version>4.14.1</selenium.version>
         <sauce.version>1.2.0</sauce.version>
         <sauce_junit5.version>1.0.0</sauce_junit5.version>
         <sauce_junit4.version>1.0.1</sauce_junit4.version>
@@ -43,13 +42,6 @@
             <version>${selenium.version}</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>io.appium</groupId>
-            <artifactId>java-client</artifactId>
-            <version>${appium.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <defaultGoal>test</defaultGoal>