diff options
author | Benoit Marty <benoit.marty@gmail.com> | 2018-06-26 10:39:33 +0200 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2018-06-27 14:00:20 -0400 |
commit | 44c5923522844343d4cb0c029fc548ba76dad95d (patch) | |
tree | 6ae9bba4389f12f13c907115eeb6b2ad0a1e87fc /android/olm-sdk/build.gradle | |
parent | ed7649d71eb3db6a7cd3d96e461cfc2d095ddbb1 (diff) |
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
Diffstat (limited to 'android/olm-sdk/build.gradle')
-rw-r--r-- | android/olm-sdk/build.gradle | 24 |
1 files changed, 10 insertions, 14 deletions
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' } |