From da7fe225d0648f259f25e6a5aa624e4ddd35b246 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 4 Aug 2016 21:18:29 +0200
Subject: [PATCH 1/4] Fix test

---
 .../java/de/test/antennapod/ui/MainActivityTest.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
index 9a0e11816..bd9057b47 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java
@@ -138,7 +138,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         ListView list = (ListView) solo.getView(R.id.nav_list);
         for (int i = 0; i < uiTestUtils.hostedFeeds.size(); i++) {
             Feed f = uiTestUtils.hostedFeeds.get(i);
-            solo.clickOnScreen(50, 50); // open nav drawer
+            openNavDrawer();
             solo.scrollListToLine(list, i);
             solo.clickOnText(f.getTitle());
             solo.waitForView(android.R.id.list);

From 0fb22e8500b49e5721c83689e3fbcd366f1f63bd Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 4 Aug 2016 21:18:53 +0200
Subject: [PATCH 2/4] Upgrade grade

---
 build.gradle                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 53638 -> 53324 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 +-
 gradlew                                  |  46 +++---
 gradlew.bat                              | 180 +++++++++++------------
 5 files changed, 118 insertions(+), 114 deletions(-)

diff --git a/build.gradle b/build.gradle
index 44cb295a4..e8e2980b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,7 @@ project.ext {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = "2.11"
+    gradleVersion = "2.14.1"
 }
 
 // free build hack: common functions
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5ccda13e9cb94678ba179b32452cf3d60dc36353..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644
GIT binary patch
delta 5305
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
A(f|Me

delta 5597
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
GqyGb=%MyJ6

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2cf959511..513d88f91 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 13 13:14:00 CET 2016
+#Thu Aug 04 19:57:05 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/gradlew b/gradlew
index 9d82f7891..27309d923 100755
--- a/gradlew
+++ b/gradlew
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
diff --git a/gradlew.bat b/gradlew.bat
index 5f192121e..f6d5974e7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

From 509960bc2685c721d85f6db345c8972542affda1 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 4 Aug 2016 21:19:03 +0200
Subject: [PATCH 3/4] Upgrade libraries

---
 build.gradle | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index e8e2980b9..40963b21d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:1.5.0"
+        classpath 'com.android.tools.build:gradle:2.1.2'
         classpath "me.tatarka:gradle-retrolambda:3.2.4"
         classpath "me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2"
         classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
@@ -38,7 +38,7 @@ subprojects {
 
 project.ext {
     compileSdkVersion = 23
-    buildToolsVersion = "23.0.2"
+    buildToolsVersion = "23.0.3"
     minSdkVersion = 10
     targetSdkVersion = 23
 
@@ -49,16 +49,16 @@ project.ext {
     flattr4jVersion = "2.13"
     glideVersion = "3.7.0"
     glideOkhttpIntegrationVersion = "1.4.0"
-    iconifyVersion = "2.2.1"
-    jsoupVersion = "1.7.3"
+    iconifyVersion = "2.2.2"
+    jsoupVersion = "1.9.2"
     materialDialogsVersion = "0.8.5.6@aar"
     okhttpVersion = "2.7.5"
-    okioVersion = "1.6.0"
+    okioVersion = "1.9.0"
     recyclerviewFlexibledividerVersion = "1.2.6"
-    robotiumSoloVersion = "5.5.3"
-    rxAndroidVersion = "1.1.0"
-    rxJavaVersion = "1.1.0"
-    rxJavaRulesVersion = "1.1.0.0"
+    robotiumSoloVersion = "5.6.0"
+    rxAndroidVersion = "1.2.1"
+    rxJavaVersion = "1.1.8"
+    rxJavaRulesVersion = "1.1.8.0"
     triangleLabelViewVersion = "1.1.0"
 
     audioPlayerVersion = "v1.0.16"

From c4869b779c2463b52739c0d9fcfb26cb85aad0a5 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Thu, 4 Aug 2016 22:22:37 +0200
Subject: [PATCH 4/4] Upgrade circle config

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 2f8f17e7a..7e4f735b5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -10,7 +10,7 @@ dependencies:
     - ~/android
   pre:
     - echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-23"
-    - echo y | android update sdk --no-ui --all --filter "build-tools-23.0.2"
+    - echo y | android update sdk --no-ui --all --filter "build-tools-23.0.3"
   override:
     - echo override dependencies