From a6e1ee093aba0c4d3db3585f9f744a24ef2669f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20M=C3=A9tais?= <geoffrey.metais@gmail.com>
Date: Fri, 16 Dec 2016 15:15:21 +0100
Subject: [PATCH] Upgrade to gradle plugin 2.3.0-beta1

---
 api/build.gradle          |  3 +--
 build.gradle              | 12 ++----------
 libvlc/build.gradle       |  2 +-
 medialibrary/build.gradle |  4 ++--
 vlc-android/build.gradle  |  4 ++--
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/api/build.gradle b/api/build.gradle
index b719c5c53..d4cfe6507 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -41,6 +41,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:appcompat-v7:25.1.0'
 }
diff --git a/build.gradle b/build.gradle
index c954b19ba..0639d1a37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,19 +5,11 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath 'com.jakewharton.sdkmanager:sdk-manager-plugin:1.5.0-SNAPSHOT'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
     }
 }
 
-allprojects {
-    repositories {
-        jcenter()
-    }
-    apply plugin: 'android-sdk-manager'
-}
-
 ext {
-    buildToolsVersion = "24.0.1"
+    buildToolsVersion = "25.0.2"
     compileSdkVersion = 24
 }
diff --git a/libvlc/build.gradle b/libvlc/build.gradle
index b12d2f91c..ed37e5579 100644
--- a/libvlc/build.gradle
+++ b/libvlc/build.gradle
@@ -94,5 +94,5 @@ task buildDebugMIPS64(type:BuildNative) {
     args('-a', "mips64")
 }
 dependencies {
-    compile 'com.android.support:support-annotations:24.2.1'
+    compile 'com.android.support:support-annotations:25.1.0'
 }
diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle
index b8023277c..5f68853a4 100644
--- a/medialibrary/build.gradle
+++ b/medialibrary/build.gradle
@@ -54,6 +54,6 @@ android {
 
 dependencies {
     compile project(':libvlc')
-    compile 'com.android.support:support-compat:24.2.1'
-    compile 'com.android.support:support-fragment:24.2.1'
+    compile 'com.android.support:support-compat:25.1.0'
+    compile 'com.android.support:support-fragment:25.1.0'
 }
\ No newline at end of file
diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index 06fd28546..739004ad5 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -210,11 +210,11 @@ dependencies {
     testCompile 'junit:junit:4.12'
 }
 
-def buildTime() {
+static def buildTime() {
     return new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("UTC"))
 }
 
-def hostName() {
+static def hostName() {
     return System.getProperty("user.name") + "@" + InetAddress.localHost.hostName
 }