diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-08-14 15:21:45 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-08-14 15:22:12 -0700 |
commit | d230307a958189041a7d5616e89fb2966011b55e (patch) | |
tree | 0e3684f094f08066de7cb68d49779a60111feded /build.gradle | |
parent | a950d40d0930abff76fd49a322715fd42cad80c9 (diff) | |
download | android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.tar.gz android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.tar.bz2 android_packages_apps_Trebuchet-d230307a958189041a7d5616e89fb2966011b55e.zip |
Migrating to android-x
Change-Id: I9a774152d13a541e8496dd84f2469bfed407f86d
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle index 4ae6600ee..dcb5b81c3 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,12 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-alpha12' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3' + classpath 'com.android.tools.build:gradle:3.2.0-beta05' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.6' } } -final String SUPPORT_LIBS_VERSION = '28.0.0-SNAPSHOT' +final String SUPPORT_LIBS_VERSION = '1.0.0-alpha1' apply plugin: 'com.android.application' apply plugin: 'com.google.protobuf' @@ -57,6 +57,8 @@ android { dimension "default" applicationId 'com.android.launcher3' testApplicationId 'com.android.launcher3.tests' + + minSdkVersion 28 } } @@ -84,7 +86,7 @@ android { androidTest { res.srcDirs = ['tests/res'] - java.srcDirs = ['tests/src'] + java.srcDirs = ['tests/src', 'tests/tapl'] manifest.srcFile "tests/AndroidManifest-common.xml" } @@ -118,9 +120,8 @@ repositories { } dependencies { - implementation "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}" - implementation "com.android.support:support-dynamic-animation:${SUPPORT_LIBS_VERSION}" - implementation "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}" + implementation "androidx.dynamicanimation:dynamicanimation:${SUPPORT_LIBS_VERSION}" + implementation "androidx.recyclerview:recyclerview:${SUPPORT_LIBS_VERSION}" implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7' quickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar') @@ -132,7 +133,7 @@ dependencies { androidTestImplementation 'com.android.support.test:runner:1.0.0' androidTestImplementation 'com.android.support.test:rules:1.0.0' androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' - androidTestImplementation "com.android.support:support-annotations:${SUPPORT_LIBS_VERSION}" + androidTestImplementation "androidx.annotation:annotation:${SUPPORT_LIBS_VERSION}" } protobuf { |