diff options
| author | Alex Ruiz <alruiz@google.com> | 2014-07-01 23:00:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-01 23:00:44 +0000 |
| commit | d70d37d6557d6babbc985ddf6a4e8bafd3579f30 (patch) | |
| tree | 089097c212c526ffe9b1f87d3379b67a4c43bd9c | |
| parent | a45b697849becce8a59438ef4f1b358ea83d2834 (diff) | |
| parent | 86bf4abd76eb924cb9eae646eb73b6d301769f50 (diff) | |
| download | base-d70d37d6557d6babbc985ddf6a4e8bafd3579f30.tar.gz | |
am 86bf4abd: am 1b5bf8f4: Merge "Added "recommended Gradle plug-in version" constant." into idea133 automerge: 0f33137
* commit '86bf4abd76eb924cb9eae646eb73b6d301769f50':
Added "recommended Gradle plug-in version" constant.
| -rw-r--r-- | common/src/main/java/com/android/SdkConstants.java | 1 | ||||
| -rw-r--r-- | lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/GradleDetector.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/src/main/java/com/android/SdkConstants.java b/common/src/main/java/com/android/SdkConstants.java index cf1ce820d8..0feef9eda2 100644 --- a/common/src/main/java/com/android/SdkConstants.java +++ b/common/src/main/java/com/android/SdkConstants.java @@ -1341,6 +1341,7 @@ public final class SdkConstants { public static final String GRADLE_LATEST_VERSION = "1.12"; public static final String GRADLE_PLUGIN_MINIMUM_VERSION = "0.12.0"; public static final String GRADLE_PLUGIN_LATEST_VERSION = "0.12.+"; + public static final String GRADLE_PLUGIN_RECOMMENDED_VERSION = "0.12.1"; public static final String MIN_BUILD_TOOLS_VERSION = "19.1.0"; public static final String SUPPORT_LIB_ARTIFACT = "com.android.support:support-v4"; public static final String APPCOMPAT_LIB_ARTIFACT = "com.android.support:appcompat-v7"; diff --git a/lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/GradleDetector.java b/lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/GradleDetector.java index cd1c14cd6e..654a038e66 100644 --- a/lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/GradleDetector.java +++ b/lint/libs/lint-checks/src/main/java/com/android/tools/lint/checks/GradleDetector.java @@ -851,7 +851,7 @@ public class GradleDetector extends Detector implements Detector.GradleScanner { if (GradleCoordinate.COMPARE_PLUS_HIGHER.compare(dependency, latestPlugin) < 0) { String message = "You must use a newer version of the Android Gradle plugin. The " + "minimum supported version is " + SdkConstants.GRADLE_PLUGIN_MINIMUM_VERSION + - " and the recommended version is " + SdkConstants.GRADLE_PLUGIN_LATEST_VERSION; + " and the recommended version is " + SdkConstants.GRADLE_PLUGIN_RECOMMENDED_VERSION; report(context, cookie, GRADLE_PLUGIN_COMPATIBILITY, message); return true; } |