From b27be9ee66b756e24e249411dfc59c414b6aab3c Mon Sep 17 00:00:00 2001 From: Adam Baker Date: Wed, 20 Jun 2018 14:52:16 +0100 Subject: [PATCH] Update gradle from version 3.3 to 4.4 --- build.gradle | 30 +++++++++++++++--------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 48d674e..32022a9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,15 @@ buildscript { repositories { mavenCentral() + maven { + url 'https://maven.google.com/' + name 'Google' + } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.alexvasilkov:android_sign:0.2' } } @@ -17,22 +22,25 @@ repositories { maven { url "http://4thline.org/m2" } + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - compile 'com.android.support:appcompat-v7:19.1.+' - compile 'com.android.support:mediarouter-v7:19.1.+' - compile 'org.fourthline.cling:cling-core:2.1.1' - compile 'org.fourthline.cling:cling-support:2.1.1' - compile 'org.eclipse.jetty:jetty-server:8.1.8.v20121106' - compile 'org.eclipse.jetty:jetty-servlet:8.1.8.v20121106' - compile 'org.eclipse.jetty:jetty-client:8.1.8.v20121106' - compile 'org.slf4j:slf4j-jdk14:1.6.1' + implementation 'com.android.support:appcompat-v7:21.0.3' + implementation 'com.android.support:mediarouter-v7:21.0.3' + implementation 'org.fourthline.cling:cling-core:2.1.1' + implementation 'org.fourthline.cling:cling-support:2.1.1' + implementation 'org.eclipse.jetty:jetty-server:8.1.8.v20121106' + implementation 'org.eclipse.jetty:jetty-servlet:8.1.8.v20121106' + implementation 'org.eclipse.jetty:jetty-client:8.1.8.v20121106' + implementation 'org.slf4j:slf4j-jdk14:1.6.1' } android { - compileSdkVersion 19 - buildToolsVersion '25.0.0' + compileSdkVersion 21 // Caused by cling, because they apparently include APIs for other platforms. lintOptions { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84dbbf8..8e9a578 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jun 11 12:46:47 BST 2017 +#Wed Jun 20 13:13:49 BST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip