timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade tools

Browse source 
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
This commit is contained in:
Benoit Marty 2018-06-26 10:39:33 +02:00 committed by Hubert Chathi
parent ed7649d71e
commit 44c5923522
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/build.gradle
View file

@ -3,9 +3,10 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -15,6 +16,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
} }
} }

2
android/gradle.properties
View file

@ -17,3 +17,5 @@ systemProp.https.proxyPort=8080
systemProp.http.proxyHost=batproxy systemProp.http.proxyHost=batproxy
systemProp.https.proxyHost=batproxy systemProp.https.proxyHost=batproxy
systemProp.http.proxyPort=8080 systemProp.http.proxyPort=8080
org.gradle.configureondemand=false

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

24
android/olm-sdk/build.gradle
View file

@ -3,8 +3,8 @@ import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 21 compileSdkVersion 27
buildToolsVersion '21.1.2' buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
minSdkVersion 11 minSdkVersion 11
@ -76,10 +76,9 @@ android {
libraryVariants.all { variant -> libraryVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->
def outputFile = output.outputFile def outputFile = output.outputFileName
if (outputFile != null && outputFile.name.endsWith('.aar')) { if (outputFile != null && outputFile.endsWith('.aar')) {
def fileName = outputFile.name.replace(".aar", "-${version}.aar") output.outputFileName = outputFile.replace(".aar", "-${version}.aar")
output.outputFile = new File(outputFile.parent, fileName)
} }
} }
} }
@ -119,12 +118,9 @@ def gitRevisionDate() {
} }
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') testImplementation 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:21.+' androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:27.1.1'
testCompile 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestCompile 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:rules:1.0.2'
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'
} }