commit | b96ce169b385d006cfccc4c9f1e54ab47140f59d | [log] [tgz] |
---|---|---|
author | Chris Warrington <cmw@google.com> | Wed Nov 04 16:11:50 2015 -0800 |
committer | Jerome Dochez <jedo@google.com> | Thu Nov 05 06:02:01 2015 +0000 |
tree | c80a601abdcb23c2683406c65d5c54324694d87c | |
parent | af65f8f2d74e9507eb381814ec711b6884f39600 [diff] |
Allow Gradle 2.10. It was checking for 2\.[2-9].* before. Change-Id: I1786b7b8563a7844945b23b60c8e765836bb61e5
diff --git a/build-system/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.java b/build-system/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.java index 91f423d..1cab723 100644 --- a/build-system/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.java +++ b/build-system/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.java
@@ -115,7 +115,7 @@ public abstract class BasePlugin { private static final String GRADLE_MIN_VERSION = "2.2"; - public static final Pattern GRADLE_ACCEPTABLE_VERSIONS = Pattern.compile("2\\.[2-9].*"); + public static final Pattern GRADLE_ACCEPTABLE_VERSIONS = Pattern.compile("2\\.([2-9]|\\d{2,}).*"); private static final String GRADLE_VERSION_CHECK_OVERRIDE_PROPERTY = "com.android.build.gradle.overrideVersionCheck"; private static final String SKIP_PATH_CHECK_PROPERTY =