Merge pull request #778 from TikhomirovSergey/master

Update to selenium 3.7.1

Author: TikhomirovSergey

build.gradle

@@ -54,7 +54,7 @@ compileJava {
     ]
 }
 
-ext.seleniumVersion = '3.6.0'
+ext.seleniumVersion = '3.7.1'
 
 dependencies {
     compile ("org.seleniumhq.selenium:selenium-java:${seleniumVersion}") {
@@ -197,6 +197,11 @@ uploadArchives {
                         url 'https://github.com/SrinivasanTarget'
                         id 'SrinivasanTarget'
                     };
+                    developer {
+                        name 'Mykola Mokhnach'
+                        url 'https://github.com/mykola-mokhnach'
+                        id 'mykola-mokhnach'
+                    };
                 }
                 licenses {
                     license {

src/main/java/io/appium/java_client/events/DefaultAspect.java

@@ -73,9 +73,6 @@ class DefaultAspect {
         + "dismiss(..))";
     private static final String EXECUTION_ALERT_SEND_KEYS = "execution(* org.openqa.selenium.Alert."
         + "sendKeys(..))";
-    private static final String EXECUTION_ALERT_AUTHENTICATION = "execution(* org.openqa.selenium."
-        + "Alert.setCredentials(..)) || "
-        + "execution(* org.openqa.selenium.Alert.authenticateUsing(..))";
     private static final String EXECUTION_WINDOW_SET_SIZE = "execution(* org.openqa.selenium."
         + "WebDriver.Window.setSize(..))";
     private static final String EXECUTION_WINDOW_SET_POSITION = "execution(* org.openqa.selenium.WebDriver."
@@ -408,26 +405,6 @@ public void afterAlertSendKeys(JoinPoint joinPoint) throws Throwable {
         }
     }
 
-    @Before(EXECUTION_ALERT_AUTHENTICATION)
-    public void beforeAlertAuthentication(JoinPoint joinPoint) throws Throwable {
-        try {
-            listener.beforeAuthentication(driver,
-                castTarget(joinPoint), castArgument(joinPoint, 0));
-        } catch (Throwable t) {
-            throw getRootCause(t);
-        }
-    }
-
-    @After(EXECUTION_ALERT_AUTHENTICATION)
-    public void afterAlertAuthentication(JoinPoint joinPoint) throws Throwable {
-        try {
-            listener.afterAuthentication(driver, castTarget(joinPoint),
-                castArgument(joinPoint, 0));
-        } catch (Throwable t) {
-            throw getRootCause(t);
-        }
-    }
-
     @Before(EXECUTION_WINDOW_SET_SIZE)
     public void beforeWindowIsResized(JoinPoint joinPoint) throws Throwable {
         try {

src/main/java/io/appium/java_client/events/DefaultListener.java

@@ -183,11 +183,13 @@ public void beforeAlertDismiss(WebDriver driver) {
     }
 
     @Override
+    @Deprecated
     public void beforeAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
         ((AlertEventListener) dispatcher).beforeAuthentication(driver, alert, credentials);
     }
 
     @Override
+    @Deprecated
     public void afterAuthentication(WebDriver driver, Alert alert, Credentials credentials) {
         ((AlertEventListener) dispatcher).afterAuthentication(driver, alert, credentials);
     }

src/main/java/io/appium/java_client/events/api/general/AlertEventListener.java

@@ -79,23 +79,31 @@ public interface AlertEventListener extends Listener {
      * This action will be performed each time before
      * {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
      * {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)}
+     * It is deprecated because methods {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
+     * {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)} were removed from selenium java client
+     * at 3.8.0. This listener method is going to be removed as well.
      *
      * @param driver WebDriver
      * @param alert {@link org.openqa.selenium.Alert} which is receiving user credentials
      * @param credentials which are being sent
      */
+    @Deprecated
     void beforeAuthentication(WebDriver driver, Alert alert,
         Credentials credentials);
 
     /**
      * This action will be performed each time after
      * {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
-     * {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)}
+     * {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)}.
+     * It is deprecated because methods {@link org.openqa.selenium.Alert#setCredentials(Credentials)} and
+     * {@link org.openqa.selenium.Alert#authenticateUsing(Credentials)} were removed from selenium java client
+     * at 3.8.0. This listener method is going to be removed as well.
      *
      * @param driver WebDriver
      * @param alert {@link org.openqa.selenium.Alert} which has received user credentials
      * @param credentials which have been sent
      */
+    @Deprecated
     void afterAuthentication(WebDriver driver, Alert alert,
         Credentials credentials);
 }