diff options
author | Douglas Sigelbaum <sigelbaum@google.com> | 2017-07-31 11:46:16 -0700 |
---|---|---|
committer | Douglas Sigelbaum <sigelbaum@google.com> | 2017-08-31 14:04:44 -0700 |
commit | 56adb6087f153e0c5121008a54f5cbbb51eaf742 (patch) | |
tree | 0601cb885ecd74128e8ba124e807727edc8a4e05 /input/autofill | |
parent | 179e2fa326ee147ffda9c0ca03be63e6874bcc06 (diff) | |
download | android-56adb6087f153e0c5121008a54f5cbbb51eaf742.tar.gz |
Autofill sample: Update versions in gradle files.
Use SDK 26 (non-beta) and revert gradle versions to be compatible with
non-preview Studio.
Bug: 38182790
Test: manual
Change-Id: Id410a113334411ca823d5b2a19c230b7137dccc7
Diffstat (limited to 'input/autofill')
6 files changed, 19 insertions, 19 deletions
diff --git a/input/autofill/AutofillFramework/Application/build.gradle b/input/autofill/AutofillFramework/Application/build.gradle index 4d556bdc..b20c02dd 100644 --- a/input/autofill/AutofillFramework/Application/build.gradle +++ b/input/autofill/AutofillFramework/Application/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' dependencies { - compile "com.android.support:support-v4:26.0.0-beta1" - compile "com.android.support:support-v13:26.0.0-beta1" - compile "com.android.support:cardview-v7:26.0.0-beta1" - compile "com.android.support:appcompat-v7:26.0.0-beta1" - compile 'com.android.support:design:26.0.0-beta1' + compile "com.android.support:support-v4:26.0.1" + compile "com.android.support:support-v13:26.0.1" + compile "com.android.support:cardview-v7:26.0.1" + compile "com.android.support:appcompat-v7:26.0.1" + compile 'com.android.support:design:26.0.1' compile 'com.android.support.constraint:constraint-layout:1.0.2' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.1' } @@ -18,7 +18,7 @@ List<String> dirs = [ android { compileSdkVersion 26 - buildToolsVersion "26.0.0" + buildToolsVersion "26.0.1" defaultConfig { minSdkVersion 26 diff --git a/input/autofill/AutofillFramework/build.gradle b/input/autofill/AutofillFramework/build.gradle index ea207688..efb29d94 100644 --- a/input/autofill/AutofillFramework/build.gradle +++ b/input/autofill/AutofillFramework/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha4' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/input/autofill/AutofillFramework/gradle/wrapper/gradle-wrapper.properties b/input/autofill/AutofillFramework/gradle/wrapper/gradle-wrapper.properties index dd1cd8e8..63426264 100644 --- a/input/autofill/AutofillFramework/gradle/wrapper/gradle-wrapper.properties +++ b/input/autofill/AutofillFramework/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 15 21:21:17 PDT 2017 +#Fri Jul 28 14:29:44 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle b/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle index 2207e4e3..ed1d6a2c 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle +++ b/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' dependencies { - compile "com.android.support:support-v4:26.0.0-beta1" - compile "com.android.support:support-v13:26.0.0-beta1" - compile 'com.android.support:appcompat-v7:26.0.0-beta1' - compile 'com.android.support:cardview-v7:26.0.0-beta1' - compile 'com.android.support:design:26.0.0-beta1' + compile "com.android.support:support-v4:26.0.1" + compile "com.android.support:support-v13:26.0.1" + compile 'com.android.support:appcompat-v7:26.0.1' + compile 'com.android.support:cardview-v7:26.0.1' + compile 'com.android.support:design:26.0.1' compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.google.code.gson:gson:2.8.1' compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" @@ -21,7 +21,7 @@ List<String> dirs = [ android { compileSdkVersion 26 - buildToolsVersion "26.0.0" + buildToolsVersion "26.0.1" defaultConfig { minSdkVersion 26 diff --git a/input/autofill/AutofillFramework/kotlinApp/build.gradle b/input/autofill/AutofillFramework/kotlinApp/build.gradle index d3caf113..76b99cb0 100644 --- a/input/autofill/AutofillFramework/kotlinApp/build.gradle +++ b/input/autofill/AutofillFramework/kotlinApp/build.gradle @@ -5,9 +5,9 @@ buildscript { url 'https://maven.google.com' } } - ext.kotlin_version = '1.1.2-4' + ext.kotlin_version = '1.1.4-2' dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha4' + classpath 'com.android.tools.build:gradle:2.3.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/input/autofill/AutofillFramework/kotlinApp/gradle/wrapper/gradle-wrapper.properties b/input/autofill/AutofillFramework/kotlinApp/gradle/wrapper/gradle-wrapper.properties index 97b77f9f..cb80c871 100644 --- a/input/autofill/AutofillFramework/kotlinApp/gradle/wrapper/gradle-wrapper.properties +++ b/input/autofill/AutofillFramework/kotlinApp/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 15 21:15:38 PDT 2017 +#Mon Jul 31 13:11:55 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip |