diff options
| author | Yuichi Araki <yaraki@google.com> | 2019-01-11 17:19:47 +0900 |
|---|---|---|
| committer | Yuichi Araki <yaraki@google.com> | 2019-01-16 08:57:07 +0900 |
| commit | f302c1310b5f751d2a5cca77974e751d36598076 (patch) | |
| tree | 0cab25fd42beff1dfd38da94544c7a5d84b021ec /input/autofill/AutofillFramework/kotlinApp | |
| parent | d07f45931e9375643efc2cc99da447104b609442 (diff) | |
| download | android-f302c1310b5f751d2a5cca77974e751d36598076.tar.gz | |
Update versions for build dependenciespie-b4s4-dev
This updates Gradle wrapper and Android Gradle Plugin.
'./gradlew assembleDebug' passes in every project in project.txt (after
'./gradlew preflight' if necessary).
LICENSE was modified in Change-Id:
I0b7143eadf2eb17b1ebf0b58e84286f9f87283d9
Test: './gradlew preflight && assembleDebug' in all projects
Bug: 122916118
Change-Id: I51f02b1fa5740090d8e75850df54053bb0440863
Diffstat (limited to 'input/autofill/AutofillFramework/kotlinApp')
3 files changed, 5 insertions, 6 deletions
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle b/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle index ed1d6a2c..95d46ae6 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle +++ b/input/autofill/AutofillFramework/kotlinApp/Application/build.gradle @@ -10,7 +10,7 @@ dependencies { 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" + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } // The sample build uses multiple directories to diff --git a/input/autofill/AutofillFramework/kotlinApp/build.gradle b/input/autofill/AutofillFramework/kotlinApp/build.gradle index 8ff27c55..00a54207 100644 --- a/input/autofill/AutofillFramework/kotlinApp/build.gradle +++ b/input/autofill/AutofillFramework/kotlinApp/build.gradle @@ -3,9 +3,9 @@ buildscript { google() jcenter() } - ext.kotlin_version = '1.1.4-3' + ext.kotlin_version = '1.3.11' dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -15,4 +15,4 @@ allprojects { google() jcenter() } -}
\ No newline at end of file +} diff --git a/input/autofill/AutofillFramework/kotlinApp/gradle/wrapper/gradle-wrapper.properties b/input/autofill/AutofillFramework/kotlinApp/gradle/wrapper/gradle-wrapper.properties index 34facd6b..f9415508 100644 --- a/input/autofill/AutofillFramework/kotlinApp/gradle/wrapper/gradle-wrapper.properties +++ b/input/autofill/AutofillFramework/kotlinApp/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Mon Jul 31 13:11:55 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https://services.gradle.org/distributions/gradle-4.10.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip |