Commit 5247b7f8 authored by Romain Hunault's avatar Romain Hunault

Fix gradle issues

parent 950fdb0b
......@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
defaultConfig {
applicationId "foundation.e.weather"
minSdkVersion 14
......@@ -16,20 +15,16 @@ android {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
applicationVariants.all { variant ->
variant.outputs.each { output ->
output.outputFile = new File(
output.outputFile.parent,
output.outputFile.name.replace("app-release.apk", "Weather-release-${variant.versionName}.apk"))
variant.outputs.all { output ->
outputFileName = "Weather-release-${variant.versionName}.apk"
}
}
}
debug {
minifyEnabled false
applicationVariants.all { variant ->
variant.outputs.each { output ->
output.outputFile = new File(
output.outputFile.parent,
output.outputFile.name.replace("app-debug.apk", "Weather-debug-${variant.versionName}.apk"))
variant.outputs.all { output ->
outputFileName = "Weather-debug-${variant.versionName}.apk"
}
}
}
......@@ -41,13 +36,13 @@ android {
}
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support:support-v4:25.3.1'
testCompile 'junit:junit:4.12'
compile 'com.google.code.gson:gson:2.6.2'
compile 'com.github.PhilJay:MPAndroidChart:v3.0.0-beta1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:25.3.1'
implementation 'com.android.support:design:25.3.1'
implementation 'com.android.support:cardview-v7:25.3.1'
implementation 'com.android.support:support-v4:25.3.1'
testImplementation 'junit:junit:4.12'
implementation 'com.google.code.gson:gson:2.6.2'
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.0-beta1'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment