From b5f7207e76d0ab0ba908a20e60800a7f9ae6212a Mon Sep 17 00:00:00 2001 From: Joey Rizzoli Date: Fri, 23 Jun 2017 14:31:47 +0200 Subject: Update build.gradle Change-Id: I21a2ae2bce55ebf5fa38899b7e956d42752453c6 Signed-off-by: Joey Rizzoli --- build.gradle | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 9bf1d891c..39a34f304 100644 --- a/build.gradle +++ b/build.gradle @@ -3,23 +3,28 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0' } } +allprojects { + ext.androidSupportVersion = '25.3.1' +} + apply plugin: 'com.android.application' apply plugin: 'com.google.protobuf' android { compileSdkVersion 25 - buildToolsVersion '24.0.0' + buildToolsVersion '25.0.2' defaultConfig { minSdkVersion 21 targetSdkVersion 25 versionCode 1 versionName "1.0" + jackOptions.enabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -28,6 +33,10 @@ android { minifyEnabled false } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } productFlavors { trebuchet { @@ -59,15 +68,15 @@ repositories { } dependencies { - compile 'com.android.support:support-v4:23.1.1' - compile 'com.android.support:recyclerview-v7:23.1.1' - compile 'com.android.support:palette-v7:23.2.0' + compile "com.android.support:appcompat-v7:${androidSupportVersion}" + compile "com.android.support:recyclerview-v7:${androidSupportVersion}" + compile "com.android.support:palette-v7:${androidSupportVersion}" compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2' testCompile 'junit:junit:4.12' androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' - androidTestCompile 'com.android.support:support-annotations:23.2.0' + androidTestCompile "com.android.support:support-annotations:${androidSupportVersion}" } protobuf { -- cgit v1.2.3