Merge "Offline version of the Gradle plugin 1.0.0"
diff --git a/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4-sources.jar b/common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4-sources.jar
rename to common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0-sources.jar
index f989cab..f05af46 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4.jar b/common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0.jar
similarity index 76%
rename from common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4.jar
rename to common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0.jar
index b331e60..ffb3560 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4.pom b/common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0.pom
similarity index 89%
rename from common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4.pom
rename to common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0.pom
index 3951557..f8adaf9 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc4/builder-model-1.0.0-rc4.pom
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.0.0/builder-model-1.0.0.pom
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-model</artifactId>
-  <version>1.0.0-rc4</version>
+  <version>1.0.0</version>
   <dependencies>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4-sources.jar b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0-sources.jar
similarity index 95%
rename from common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4-sources.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0-sources.jar
index 5ea67ea..2dca201 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4.jar b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0.jar
similarity index 65%
rename from common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0.jar
index dbd4955..4c07c99 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4.pom b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0.pom
similarity index 89%
rename from common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4.pom
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0.pom
index f1f9930..5e93137 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc4/builder-test-api-1.0.0-rc4.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0/builder-test-api-1.0.0.pom
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-test-api</artifactId>
-  <version>1.0.0-rc4</version>
+  <version>1.0.0</version>
   <dependencies>
     <dependency>
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4-sources.jar b/common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0-sources.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4-sources.jar
rename to common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0-sources.jar
index c2c30ba..c8e704b 100644
--- a/common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4.jar b/common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0.jar
similarity index 86%
rename from common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4.jar
rename to common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0.jar
index fd8cc65..c025fb9 100644
--- a/common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4.jar
+++ b/common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4.pom b/common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0.pom
similarity index 88%
rename from common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4.pom
rename to common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0.pom
index 6ec8d45..b626e6d 100644
--- a/common/offline-m2/com/android/tools/build/builder/1.0.0-rc4/builder-1.0.0-rc4.pom
+++ b/common/offline-m2/com/android/tools/build/builder/1.0.0/builder-1.0.0.pom
@@ -4,15 +4,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder</artifactId>
-  <version>1.0.0-rc4</version>
+  <version>1.0.0</version>
   <dependencies>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>24.0.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
@@ -25,21 +31,15 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>23.2.8</version>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>23.2.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>23.2.8</version>
+      <artifactId>common</artifactId>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -51,19 +51,25 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-test-api</artifactId>
-      <version>1.0.0-rc4</version>
+      <version>1.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>1.0.0-rc4</version>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>manifest-merger</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>1.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -73,12 +79,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>23.2.8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>1.48</version>
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4.jar b/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4.jar
deleted file mode 100644
index 562d938..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4-sources.jar b/common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0-sources.jar
similarity index 87%
rename from common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4-sources.jar
rename to common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0-sources.jar
index 1414d35..1a32208 100644
--- a/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0.jar b/common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0.jar
new file mode 100644
index 0000000..6244c0a
--- /dev/null
+++ b/common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4.pom b/common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4.pom
rename to common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0.pom
index 33c09a8..45fb082 100644
--- a/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc4/gradle-1.0.0-rc4.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/1.0.0/gradle-1.0.0.pom
@@ -4,27 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle</artifactId>
-  <version>1.0.0-rc4</version>
+  <version>1.0.0</version>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>1.0.0-rc4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.proguard</groupId>
-      <artifactId>proguard-gradle</artifactId>
-      <version>5.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>tools.base</groupId>
       <artifactId>project-test-lib</artifactId>
       <version>unspecified</version>
@@ -33,7 +15,25 @@
     <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.proguard</groupId>
+      <artifactId>proguard-gradle</artifactId>
+      <version>5.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8-sources.jar b/common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0-sources.jar
index b5063de..85eae44 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8.jar b/common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0.jar
index ad13519..c142b09 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8.pom b/common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0.pom
similarity index 91%
rename from common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8.pom
rename to common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0.pom
index d84672e..52700b0 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.8/manifest-merger-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/24.0.0/manifest-merger-24.0.0.pom
@@ -4,27 +4,33 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>manifest-merger</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>23.2.8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>net.sf.kxml</groupId>
       <artifactId>kxml2</artifactId>
       <version>2.3.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
@@ -33,13 +39,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>23.2.8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8-sources.jar b/common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0-sources.jar
similarity index 76%
rename from common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0-sources.jar
index a32b34a..79d84d7 100644
--- a/common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8.jar b/common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0.jar
similarity index 84%
rename from common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8.jar
rename to common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0.jar
index b5c55d2..3fed18a 100644
--- a/common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8.pom b/common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8.pom
rename to common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0.pom
index 0dbd12c..72104a6 100644
--- a/common/offline-m2/com/android/tools/common/23.2.8/common-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/common/24.0.0/common-24.0.0.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>common</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8-sources.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0-sources.jar
index a4640d2..4b31a62 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0.jar
index 71bcaf7..c0eb9f9 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8.pom
rename to common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0.pom
index 3c342cf..dab6844 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.8/ddmlib-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/24.0.0/ddmlib-24.0.0.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.ddms</groupId>
   <artifactId>ddmlib</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
       <groupId>net.sf.kxml</groupId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8-sources.jar b/common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0-sources.jar
index bb24e78..3495fd2 100644
--- a/common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8.jar b/common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8.jar
rename to common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0.jar
index f0d032e..acb1e64 100644
--- a/common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8.pom b/common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0.pom
similarity index 91%
rename from common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8.pom
rename to common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0.pom
index d4b705b..e41d2f2 100644
--- a/common/offline-m2/com/android/tools/dvlib/23.2.8/dvlib-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/dvlib/24.0.0/dvlib-24.0.0.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>dvlib</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8-sources.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0-sources.jar
index e511927..219b79e 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0.jar
index 4d74d7d..6ada580 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8.pom
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0.pom
index 3d7fcd7..d08336d 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.8/layoutlib-api-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.0.0/layoutlib-api-24.0.0.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.layoutlib</groupId>
   <artifactId>layoutlib-api</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
       <groupId>net.sf.kxml</groupId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8-sources.jar b/common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0-sources.jar
index 436a43b..12fa9a0 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8.jar b/common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0.jar
index 4f322c9..fce9160 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8.pom b/common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8.pom
rename to common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0.pom
index 9a353d0..a98c80b 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/23.2.8/lint-api-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/24.0.0/lint-api-24.0.0.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-api</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
       <groupId>org.ow2.asm</groupId>
@@ -13,28 +13,28 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>1.0.0-rc4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>23.2.8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.external.lombok</groupId>
       <artifactId>lombok-ast</artifactId>
       <version>0.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
       <version>4.0</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8-sources.jar b/common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0-sources.jar
index d7c8869..c26dd89 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8.jar b/common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0.jar
index 9753ced..4bc3c24 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8.pom b/common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8.pom
rename to common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0.pom
index 589fc42..56735bd 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.8/lint-checks-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/24.0.0/lint-checks-24.0.0.pom
@@ -4,9 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-checks</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>24.0.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
@@ -15,16 +21,10 @@
     <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint-api</artifactId>
-      <version>23.2.8</version>
+      <version>24.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>23.2.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-analysis</artifactId>
       <version>4.0</version>
diff --git a/common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8-sources.jar b/common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0-sources.jar
index 9320e21..45df382 100644
--- a/common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8.jar b/common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8.jar
rename to common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0.jar
index 4e92918..a2f4abf 100644
--- a/common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8.pom b/common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8.pom
rename to common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0.pom
index 57d5a5a..e215aa9 100644
--- a/common/offline-m2/com/android/tools/lint/lint/23.2.8/lint-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/lint/lint/24.0.0/lint-24.0.0.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
@@ -13,10 +13,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>23.2.8</version>
-      <scope>compile</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>24.0.0</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jdt.core.compiler</groupId>
@@ -25,18 +25,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-checks</artifactId>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>23.2.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.1</version>
diff --git a/common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8-sources.jar b/common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0-sources.jar
index f850aa3..47e244c 100644
--- a/common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8.jar b/common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8.jar
rename to common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0.jar
index 510bf61..0fed7f6 100644
--- a/common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8.pom b/common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0.pom
similarity index 88%
rename from common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8.pom
rename to common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0.pom
index ccbdc07..cc029ec 100644
--- a/common/offline-m2/com/android/tools/sdk-common/23.2.8/sdk-common-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/24.0.0/sdk-common-24.0.0.pom
@@ -4,30 +4,30 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdk-common</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>24.0.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>23.2.8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>23.2.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-test-api</artifactId>
-      <version>1.0.0-rc4</version>
+      <version>1.0.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8-sources.jar b/common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8-sources.jar
rename to common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0-sources.jar
index 51ba5da..4206d9a 100644
--- a/common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8-sources.jar
+++ b/common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8.jar b/common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8.jar
rename to common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0.jar
index 7e872b5..b9d6333 100644
--- a/common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8.jar
+++ b/common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8.pom b/common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8.pom
rename to common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0.pom
index bd562ec..be560c2 100644
--- a/common/offline-m2/com/android/tools/sdklib/23.2.8/sdklib-23.2.8.pom
+++ b/common/offline-m2/com/android/tools/sdklib/24.0.0/sdklib-24.0.0.pom
@@ -4,27 +4,33 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdklib</artifactId>
-  <version>23.2.8</version>
+  <version>24.0.0</version>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>dvlib</artifactId>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>4.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>23.2.8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
       <version>4.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.layoutlib</groupId>
+      <artifactId>layoutlib-api</artifactId>
+      <version>24.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
@@ -36,11 +42,5 @@
       <version>1.8.1</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>23.2.8</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>