Skip to content
Snippets Groups Projects
Commit 44c59235 authored by Benoit Marty's avatar Benoit Marty Committed by Hubert Chathi
Browse files

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
parent ed7649d7
No related branches found
No related tags found
No related merge requests found
...@@ -3,9 +3,10 @@ ...@@ -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 { ...@@ -15,6 +16,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
} }
} }
......
...@@ -17,3 +17,5 @@ systemProp.https.proxyPort=8080 ...@@ -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
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -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
...@@ -3,8 +3,8 @@ import org.apache.tools.ant.taskdefs.condition.Os ...@@ -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 { ...@@ -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() { ...@@ -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'
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment