diff options
| author | Alex Ruiz <alruiz@google.com> | 2014-12-11 03:33:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-11 03:33:55 +0000 |
| commit | 98e28d55714e02ebb032e30236012b41dba0b902 (patch) | |
| tree | 00b26a697123daa75a023dc812f5b04037619693 | |
| parent | eecde7176a8fd0a89978fc5d009c3681dee5abb0 (diff) | |
| parent | b3193c9bc4b4b12ff38cb2cc1e35075e90947b26 (diff) | |
| download | base-98e28d55714e02ebb032e30236012b41dba0b902.tar.gz | |
Merge "Updated usage of Android Gradle plug-in to version 1.0.0." into studio-1.0-dev automerge: e3c068f
automerge: b3193c9
* commit 'b3193c9bc4b4b12ff38cb2cc1e35075e90947b26':
Updated usage of Android Gradle plug-in to version 1.0.0.
| -rw-r--r-- | .idea/libraries/builder_model.xml | 4 | ||||
| -rw-r--r-- | common/src/main/java/com/android/SdkConstants.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.idea/libraries/builder_model.xml b/.idea/libraries/builder_model.xml index 7c5bbf9df7..487ee29fc3 100644 --- a/.idea/libraries/builder_model.xml +++ b/.idea/libraries/builder_model.xml @@ -1,11 +1,11 @@ <component name="libraryTable"> <library name="builder-model"> <CLASSES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/builder-model/builder-model-0.14.3.jar!/" /> + <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/builder-model/builder-model-1.0.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/builder-model/builder-model-0.14.3-sources.jar!/" /> + <root url="jar://$PROJECT_DIR$/../../prebuilts/tools/common/builder-model/builder-model-1.0.0-sources.jar!/" /> </SOURCES> </library> </component>
\ No newline at end of file diff --git a/common/src/main/java/com/android/SdkConstants.java b/common/src/main/java/com/android/SdkConstants.java index 8af2e45f62..15a28f09b2 100644 --- a/common/src/main/java/com/android/SdkConstants.java +++ b/common/src/main/java/com/android/SdkConstants.java @@ -1355,10 +1355,10 @@ public final class SdkConstants { public static final String VALUE_HORIZONTAL = "horizontal"; //$NON-NLS-1$ public static final String GRADLE_PLUGIN_NAME = "com.android.tools.build:gradle:"; - public static final String GRADLE_MINIMUM_VERSION = "2.2"; + public static final String GRADLE_MINIMUM_VERSION = "2.2.1"; public static final String GRADLE_LATEST_VERSION = "2.2.1"; - public static final String GRADLE_PLUGIN_MINIMUM_VERSION = "0.14.0"; - public static final String GRADLE_PLUGIN_RECOMMENDED_VERSION = "1.0.0-rc4"; + public static final String GRADLE_PLUGIN_MINIMUM_VERSION = "1.0.0"; + public static final String GRADLE_PLUGIN_RECOMMENDED_VERSION = "1.0.0"; public static final String GRADLE_PLUGIN_LATEST_VERSION = GRADLE_PLUGIN_RECOMMENDED_VERSION; public static final String MIN_BUILD_TOOLS_VERSION = "19.1.0"; public static final String SUPPORT_LIB_ARTIFACT = "com.android.support:support-v4"; |