From 5d9b51c42e4077d5975c2b74262e9ca78a6ed5a7 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 26 Nov 2017 23:42:42 -0500 Subject: Build tool versions --- build.gradle | 2 +- main/build.gradle | 31 +++++++++++++++++-------------- remoteExample/build.gradle | 6 +++--- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index f88bc5d2..c482d85a 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.android.tools.build:gradle:3.1.0-alpha04' } } diff --git a/main/build.gradle b/main/build.gradle index afe19468..6b49c36d 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -8,9 +8,9 @@ import com.android.builder.model.ProductFlavor apply plugin: 'com.android.application' apply plugin: 'checkstyle' - checkstyle { +checkstyle { showViolations true - } +} repositories { jcenter() @@ -19,9 +19,10 @@ repositories { } dependencies { - compile 'com.android.support:support-annotations:26.0.0' - compile 'com.android.support:cardview-v7:26.0.0' - compile 'com.android.support:recyclerview-v7:26.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + compile 'com.android.support:support-annotations:27.0.1' + compile 'com.android.support:cardview-v7:27.0.1' + compile 'com.android.support:recyclerview-v7:27.0.1' // compile 'ch.acra:acra:4.5.0' compile 'com.github.PhilJay:MPAndroidChart:v3.0.2' @@ -30,7 +31,7 @@ dependencies { android { compileSdkVersion 26 - buildToolsVersion '26.0.0' + buildToolsVersion '27.0.1' defaultConfig { minSdkVersion 14 @@ -45,9 +46,9 @@ android { jniLibs.srcDirs = ['ovpnlibs/jniLibs'] jni.srcDirs = [] //disable automatic ndk-build } - + ovpn3 { - + } debug { @@ -84,22 +85,24 @@ android { flavorDimensions "implementation" productFlavors { - /*ovpn3 { + /*ovpn3 { dimension "implementation" } */ - normal { - dimension "implementation" - } + normal { + dimension "implementation" + } } + compileOptions { + targetCompatibility 1.8 + sourceCompatibility 1.8 + } } - - // ~/.gradle/gradle.properties if (project.hasProperty('keystoreFile') && project.hasProperty('keystorePassword') && diff --git a/remoteExample/build.gradle b/remoteExample/build.gradle index 31049d5d..cae24e03 100644 --- a/remoteExample/build.gradle +++ b/remoteExample/build.gradle @@ -6,12 +6,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.1' defaultConfig { minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" } -- cgit v1.2.3