diff options
author | Joey Rizzoli <joey@lineageos.org> | 2017-11-10 14:20:56 +0100 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2017-12-16 06:58:07 +0100 |
commit | a48cdf29c2b220741f76e9949da8f2aa35d08ade (patch) | |
tree | 65beabb7ece1e52a6952737e6ed900bee5ed948f /build.gradle | |
parent | 5014b745904b55877fc4e2c4d93a2300cd209f1e (diff) | |
download | android_packages_apps_Trebuchet-a48cdf29c2b220741f76e9949da8f2aa35d08ade.tar.gz android_packages_apps_Trebuchet-a48cdf29c2b220741f76e9949da8f2aa35d08ade.tar.bz2 android_packages_apps_Trebuchet-a48cdf29c2b220741f76e9949da8f2aa35d08ade.zip |
Trebuchet: update gradle deps
Change-Id: I5a9fa781d0faa826cf982d5c723f275faa50bb80
Signed-off-by: Joey Rizzoli <joey@lineageos.org>
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/build.gradle b/build.gradle index 6473b2de1..5997e889a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { mavenCentral() jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0' + classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3' } } @@ -14,7 +15,7 @@ apply plugin: 'com.google.protobuf' android { compileSdkVersion 26 - buildToolsVersion '26.0.0' + buildToolsVersion '26.0.2' defaultConfig { minSdkVersion 23 @@ -30,8 +31,11 @@ android { } } + flavorDimensions "trebuchet" + productFlavors { trebuchet { + dimension "trebuchet" applicationId 'org.lineageos.trebuchet' testApplicationId 'org.lineageos.trebuchet.tests' } @@ -59,8 +63,10 @@ android { } trebuchet { + res.srcDirs = ['res'] java.srcDirs = ['src_flags'] - manifest.srcFile "AndroidManifest.xml" + manifest.srcFile 'AndroidManifest.xml' + proto.srcDirs 'protos/' } aospAndroidTest { @@ -79,14 +85,20 @@ android { manifest.srcFile "tests/AndroidManifest.xml" } } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } repositories { mavenCentral() jcenter() + google() } -final String SUPPORT_LIBS_VERSION = '26.0.0-SNAPSHOT' +final String SUPPORT_LIBS_VERSION = '26.1.0' dependencies { compile "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}" compile "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}" @@ -95,18 +107,18 @@ dependencies { compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7' testCompile 'junit:junit:4.12' - androidTestCompile "org.mockito:mockito-core:1.9.5" + androidTestCompile "org.mockito:mockito-core:1.10.19" androidTestCompile 'com.google.dexmaker:dexmaker:1.2' androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' + androidTestCompile 'com.android.support.test:runner:1.0.1' + androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3' androidTestCompile "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}" } protobuf { // Configure the protoc executable protoc { - artifact = 'com.google.protobuf:protoc:3.0.0-alpha-3' + artifact = 'com.google.protobuf:protoc:3.0.0' generateProtoTasks { all().each { task -> @@ -117,6 +129,7 @@ protobuf { option "java_package=launcher_log.proto|com.android.launcher3.userevent.nano" option "java_package=launcher_dump.proto|com.android.launcher3.model.nano" option "enum_style=java" + option 'ignore_services=false' } } } |