From b46eeb64748bfc514d65853b3210c12c314f6b00 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 2 Apr 2018 12:40:56 -0400
Subject: [PATCH] Migration to Android plugin for gradle 3.0

travis has already updated, requiring local changes according to https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html

No need to "iterate" through a single item

Remove unused manifest parameter for Apache legacy
---
 .travis.yml                                                | 2 +-
 shell/android-studio/app/build.gradle                      | 7 ++-----
 shell/android-studio/app/src/main/AndroidManifest.xml      | 6 +-----
 shell/android-studio/build.gradle                          | 4 +++-
 .../gradle/wrapper/gradle-wrapper.properties               | 4 ++--
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51a6807ad..dc2081127 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ script:
 before_deploy:
 - cd ../../
 - mkdir -p artifacts/$GIT_BUILD/
-- cp shell/android-studio/app/build/outputs/apk/app-debug.apk  artifacts/$GIT_BUILD/reicast-android-debug-$GIT_HASH.apk
+- cp shell/android-studio/app/build/outputs/apk/debug/app-debug.apk artifacts/$GIT_BUILD/reicast-android-debug-$GIT_HASH.apk
 deploy:
   provider: s3
   access_key_id: AKIAJR5J3OHAQUP5BHHQ
diff --git a/shell/android-studio/app/build.gradle b/shell/android-studio/app/build.gradle
index 42059c35c..113b223eb 100644
--- a/shell/android-studio/app/build.gradle
+++ b/shell/android-studio/app/build.gradle
@@ -45,10 +45,7 @@ afterEvaluate {
                 standardOutput = hashtag
             }
             hashtag = hashtag.toString().trim()
-            v.outputs.each { output ->
-                output.outputFile = new File(output.outputFile.parent,
-                        "reicast-android-" + hashtag.substring(0,7) + ".apk")
-            }
+            v.outputs[0].outputFileName = "reicast-android-" + hashtag.substring(0,7) + ".apk"
             file('src/main/assets/build').text = hashtag
         }
     }
@@ -63,4 +60,4 @@ dependencies {
         exclude module: 'junit'
     }
     compile fileTree(include: ['*.jar'], dir: 'libs')
-}
\ No newline at end of file
+}
diff --git a/shell/android-studio/app/src/main/AndroidManifest.xml b/shell/android-studio/app/src/main/AndroidManifest.xml
index 745858746..4372eea18 100644
--- a/shell/android-studio/app/src/main/AndroidManifest.xml
+++ b/shell/android-studio/app/src/main/AndroidManifest.xml
@@ -49,10 +49,6 @@
         <meta-data
             android:name="xperiaplayoptimized_content"
             android:resource="@drawable/ic_xperia_play" />
-        
-        <uses-library 
-        	android:name="org.apache.http.legacy" 
-        	android:required="false" />
 
         <activity
             android:name=".MainActivity"
@@ -135,4 +131,4 @@
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/shell/android-studio/build.gradle b/shell/android-studio/build.gradle
index e4467f8ed..390aecc9c 100644
--- a/shell/android-studio/build.gradle
+++ b/shell/android-studio/build.gradle
@@ -2,14 +2,16 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff --git a/shell/android-studio/gradle/wrapper/gradle-wrapper.properties b/shell/android-studio/gradle/wrapper/gradle-wrapper.properties
index c54765190..7de1142e7 100644
--- a/shell/android-studio/gradle/wrapper/gradle-wrapper.properties
+++ b/shell/android-studio/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 25 16:10:23 CET 2017
+#Mon Apr 02 06:06:44 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip