From 44c5923522844343d4cb0c029fc548ba76dad95d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Tue, 26 Jun 2018 10:39:33 +0200
Subject: [PATCH] Upgrade tools
gradle 2.14.1 to 4.7
build tools 21.1.2 to 27.0.3
build gradle 2.1.3 to 3.1.3
---
android/build.gradle | 4 +++-
android/gradle.properties | 2 ++
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
android/olm-sdk/build.gradle | 24 ++++++++-----------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/android/build.gradle b/android/build.gradle
index 77ce66e..ad6a928 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
+ google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.3'
+ classpath 'com.android.tools.build:gradle:3.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
+ google()
}
}
diff --git a/android/gradle.properties b/android/gradle.properties
index 13d64a5..ff53440 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -17,3 +17,5 @@ systemProp.https.proxyPort=8080
systemProp.http.proxyHost=batproxy
systemProp.https.proxyHost=batproxy
systemProp.http.proxyPort=8080
+
+org.gradle.configureondemand=false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 4ba4622..87043e3 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 9601c87..c114968 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -3,8 +3,8 @@ import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.library'
android {
- compileSdkVersion 21
- buildToolsVersion '21.1.2'
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
defaultConfig {
minSdkVersion 11
@@ -76,10 +76,9 @@ android {
libraryVariants.all { variant ->
variant.outputs.each { output ->
- def outputFile = output.outputFile
- if (outputFile != null && outputFile.name.endsWith('.aar')) {
- def fileName = outputFile.name.replace(".aar", "-${version}.aar")
- output.outputFile = new File(outputFile.parent, fileName)
+ def outputFile = output.outputFileName
+ if (outputFile != null && outputFile.endsWith('.aar')) {
+ output.outputFileName = outputFile.replace(".aar", "-${version}.aar")
}
}
}
@@ -119,12 +118,9 @@ def gitRevisionDate() {
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support:appcompat-v7:21.+'
-
- testCompile 'junit:junit:4.12'
- androidTestCompile 'junit:junit:4.12'
- androidTestCompile 'com.android.support:support-annotations:21.0.0'
- androidTestCompile 'com.android.support.test:runner:0.5'
- androidTestCompile 'com.android.support.test:rules:0.5'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'junit:junit:4.12'
+ androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test:rules:1.0.2'
}
--
GitLab