diff options
author | Yigit Boyar <yboyar@google.com> | 2016-12-14 15:50:54 -0800 |
---|---|---|
committer | Yigit Boyar <yboyar@google.com> | 2016-12-14 16:28:18 -0800 |
commit | ca3422f74c24286ec5227ef9df265504a6c3aa02 (patch) | |
tree | e8718e8ebca8fc2628c3e427183a633f72022ad5 | |
parent | 7ef0db71cfa91c14837af259e3c7d858b2f1939c (diff) | |
download | data-binding-ca3422f74c24286ec5227ef9df265504a6c3aa02.tar.gz |
Update gradle versions and support lib dependency
This CL moves the dependency of extensions to core-utils to avoid
lint errors starting 2.3.
It also updates the test projects to use gradle 3.2.
Bug: https://code.google.com/p/android/issues/detail?id=229664
Test: existing tests pass
Change-Id: I125c17d6cf6f18fa4d29f8831ba43a07ba20ccff
14 files changed, 17 insertions, 18 deletions
@@ -9,4 +9,5 @@ maven-repo .idea/modules old-version-projects/tmp-maven-repo integration-tests/*/build -old-version-projects/*/build
\ No newline at end of file +old-version-projects/*/build +build/kotlin-build/caches/version.txt diff --git a/developmentPlugins/gradle/wrapper/gradle-wrapper.properties b/developmentPlugins/gradle/wrapper/gradle-wrapper.properties index 911e42a9..273c8bec 100644 --- a/developmentPlugins/gradle/wrapper/gradle-wrapper.properties +++ b/developmentPlugins/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/extensions/baseAdapters/build.gradle b/extensions/baseAdapters/build.gradle index f2509d26..ed82bb25 100644 --- a/extensions/baseAdapters/build.gradle +++ b/extensions/baseAdapters/build.gradle @@ -52,12 +52,10 @@ android { } } -configurations.all { - resolutionStrategy.force 'com.android.support:support-v4:21.0.3' -} - dependencies { - provided 'com.android.support:support-v4:+' + // we don't care about version of these because they are not listed as dependencies in the + // final maven artifact. + provided 'com.android.support:core-utils:+' provided 'com.android.support:cardview-v7:+' provided 'com.android.support:appcompat-v7:+' } diff --git a/extensions/gradle/wrapper/gradle-wrapper.properties b/extensions/gradle/wrapper/gradle-wrapper.properties index 65daefc7..6bfd799b 100644 --- a/extensions/gradle/wrapper/gradle-wrapper.properties +++ b/extensions/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/extensions/library/build.gradle b/extensions/library/build.gradle index af80f6b8..b924d173 100644 --- a/extensions/library/build.gradle +++ b/extensions/library/build.gradle @@ -68,7 +68,7 @@ configurations { dependencies { - compile 'com.android.support:support-v4:21.0.3' + compile 'com.android.support:support-core-utils:24.2.0' compile "com.android.databinding:baseLibrary:${dataBindingConfig.version}" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 65daefc7..6bfd799b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/integration-tests/App With Spaces/gradle/wrapper/gradle-wrapper.properties b/integration-tests/App With Spaces/gradle/wrapper/gradle-wrapper.properties index 909535ae..4abf9919 100644 --- a/integration-tests/App With Spaces/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/App With Spaces/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/integration-tests/AppWithDataBindingInTests/gradle/wrapper/gradle-wrapper.properties b/integration-tests/AppWithDataBindingInTests/gradle/wrapper/gradle-wrapper.properties index 04e285f3..467c103f 100644 --- a/integration-tests/AppWithDataBindingInTests/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/AppWithDataBindingInTests/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/integration-tests/IndependentLibrary/gradle/wrapper/gradle-wrapper.properties b/integration-tests/IndependentLibrary/gradle/wrapper/gradle-wrapper.properties index 9446428d..37fcc503 100644 --- a/integration-tests/IndependentLibrary/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/IndependentLibrary/gradle/wrapper/gradle-wrapper.properties @@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/integration-tests/MultiModuleTestApp/gradle/wrapper/gradle-wrapper.properties b/integration-tests/MultiModuleTestApp/gradle/wrapper/gradle-wrapper.properties index 909535ae..4abf9919 100644 --- a/integration-tests/MultiModuleTestApp/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/MultiModuleTestApp/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/integration-tests/ProguardedAppWithTest/gradle/wrapper/gradle-wrapper.properties b/integration-tests/ProguardedAppWithTest/gradle/wrapper/gradle-wrapper.properties index 04e285f3..467c103f 100644 --- a/integration-tests/ProguardedAppWithTest/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/ProguardedAppWithTest/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.properties b/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.properties index 1081cc34..b6eff389 100644 --- a/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/old-version-projects/TestAppWithOldDependency/gradle/wrapper/gradle-wrapper.properties b/old-version-projects/TestAppWithOldDependency/gradle/wrapper/gradle-wrapper.properties index 909535ae..4abf9919 100644 --- a/old-version-projects/TestAppWithOldDependency/gradle/wrapper/gradle-wrapper.properties +++ b/old-version-projects/TestAppWithOldDependency/gradle/wrapper/gradle-wrapper.properties @@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip diff --git a/samples/BindingDemo/gradle/wrapper/gradle-wrapper.properties b/samples/BindingDemo/gradle/wrapper/gradle-wrapper.properties index 30fc66fb..d6ba79d6 100644 --- a/samples/BindingDemo/gradle/wrapper/gradle-wrapper.properties +++ b/samples/BindingDemo/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip |