Merge "Adding jaxb-runtime and dependencies"
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4-sources.jar
deleted file mode 100644
index b07bcdc..0000000
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta7/baseLibrary-2.0.0-beta7.jar
similarity index 75%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4.jar
rename to common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta7/baseLibrary-2.0.0-beta7.jar
index f934e8e..f099c35 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta7/baseLibrary-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta7/baseLibrary-2.0.0-beta7.pom
similarity index 96%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4.pom
rename to common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta7/baseLibrary-2.0.0-beta7.pom
index b48d38f..bd61cfd 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta4/baseLibrary-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta7/baseLibrary-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.databinding</groupId>
<artifactId>baseLibrary</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Data Binding Base Library</name>
<description>Shared library between Data Binding runtime lib and compiler</description>
<url>http://tools.android.com</url>
diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4-sources.jar
deleted file mode 100644
index aa39689..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4.jar b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4.jar
deleted file mode 100644
index 078ddb4..0000000
--- a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta7/compiler-2.0.0-beta7.jar b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta7/compiler-2.0.0-beta7.jar
new file mode 100644
index 0000000..2cc7421
--- /dev/null
+++ b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta7/compiler-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4.pom b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta7/compiler-2.0.0-beta7.pom
similarity index 93%
rename from common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4.pom
rename to common/offline-m2/com/android/databinding/compiler/2.0.0-beta7/compiler-2.0.0-beta7.pom
index 29a5148..e0031cc 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta4/compiler-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta7/compiler-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.databinding</groupId>
<artifactId>compiler</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Data Binding Annotation Processor</name>
<description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
<url>http://tools.android.com</url>
@@ -33,21 +33,21 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.10</version>
+ <groupId>com.android.databinding</groupId>
+ <artifactId>baseLibrary</artifactId>
+ <version>2.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.android.databinding</groupId>
<artifactId>compilerCommon</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib</artifactId>
- <version>1.0.0-beta-4584</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.10</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -57,12 +57,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.android.databinding</groupId>
- <artifactId>baseLibrary</artifactId>
- <version>2.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.tunnelvisionlabs</groupId>
<artifactId>antlr4</artifactId>
<version>4.5</version>
@@ -74,5 +68,11 @@
<version>2.4</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib</artifactId>
+ <version>1.0.0</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4-sources.jar
deleted file mode 100644
index 5b5462d..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4.jar
deleted file mode 100644
index dd66eb2..0000000
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta7/compilerCommon-2.0.0-beta7.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta7/compilerCommon-2.0.0-beta7.jar
new file mode 100644
index 0000000..9016f3b
--- /dev/null
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta7/compilerCommon-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta7/compilerCommon-2.0.0-beta7.pom
similarity index 96%
rename from common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4.pom
rename to common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta7/compilerCommon-2.0.0-beta7.pom
index ae518c7..b74127f 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta4/compilerCommon-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta7/compilerCommon-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.databinding</groupId>
<artifactId>compilerCommon</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Data Binding Compiler Common</name>
<description>Common library that can be shared between different build tools</description>
<url>http://tools.android.com</url>
@@ -39,18 +39,18 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>com.android.databinding</groupId>
+ <artifactId>baseLibrary</artifactId>
+ <version>2.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.android.databinding</groupId>
- <artifactId>baseLibrary</artifactId>
- <version>2.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.tunnelvisionlabs</groupId>
<artifactId>antlr4</artifactId>
<version>4.5</version>
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4-sources.jar
deleted file mode 100644
index d26ee04..0000000
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/annotations/25.0.0-beta7/annotations-25.0.0-beta7.jar
similarity index 80%
rename from common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/annotations/25.0.0-beta7/annotations-25.0.0-beta7.jar
index 2ec5116..7a90535 100644
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.0.0-beta7/annotations-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/annotations/25.0.0-beta7/annotations-25.0.0-beta7.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/annotations/25.0.0-beta7/annotations-25.0.0-beta7.pom
index 17d2d83..9301031 100644
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-beta4/annotations-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/annotations/25.0.0-beta7/annotations-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools</groupId>
<artifactId>annotations</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools Annotations library</name>
<description>annotations used throughout the Android tools libraries.</description>
<url>http://tools.android.com</url>
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4-sources.jar
deleted file mode 100644
index 26a1808..0000000
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4.jar b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta7/builder-model-2.0.0-beta7.jar
similarity index 73%
rename from common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta7/builder-model-2.0.0-beta7.jar
index 3d5e8e6..ad0012e 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta7/builder-model-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4.pom b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta7/builder-model-2.0.0-beta7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta7/builder-model-2.0.0-beta7.pom
index f4eae18..ddf9316 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta4/builder-model-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta7/builder-model-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.build</groupId>
<artifactId>builder-model</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Android Builder Model library</name>
<description>Model for the Builder library.</description>
<url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
<dependency>
<groupId>com.android.tools</groupId>
<artifactId>annotations</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4-sources.jar
deleted file mode 100644
index d542e83..0000000
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta7/builder-test-api-2.0.0-beta7.jar
similarity index 77%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta7/builder-test-api-2.0.0-beta7.jar
index 359c82e..a7fc483 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta7/builder-test-api-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta7/builder-test-api-2.0.0-beta7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta7/builder-test-api-2.0.0-beta7.pom
index 6dd9b10..6e7e788 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta4/builder-test-api-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta7/builder-test-api-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.build</groupId>
<artifactId>builder-test-api</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Android Builder Test API library</name>
<description>API for the Test extension point in the Builder library.</description>
<url>http://tools.android.com</url>
@@ -35,7 +35,7 @@
<dependency>
<groupId>com.android.tools.ddms</groupId>
<artifactId>ddmlib</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4-sources.jar
deleted file mode 100644
index cf2c650..0000000
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4.jar b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta7/builder-2.0.0-beta7.jar
similarity index 79%
rename from common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/build/builder/2.0.0-beta7/builder-2.0.0-beta7.jar
index 504788c..71859f3 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta7/builder-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4.pom b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta7/builder-2.0.0-beta7.pom
similarity index 91%
rename from common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/build/builder/2.0.0-beta7/builder-2.0.0-beta7.pom
index 2b5f13c..2540f84 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta4/builder-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta7/builder-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.build</groupId>
<artifactId>builder</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Android Builder library</name>
<description>Library to build Android applications.</description>
<url>http://tools.android.com</url>
@@ -27,9 +27,9 @@
</scm>
<dependencies>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>common</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>com.android.tools.build</groupId>
+ <artifactId>builder-model</artifactId>
+ <version>2.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -39,12 +39,24 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools.jill</groupId>
+ <artifactId>jill-api</artifactId>
+ <version>0.9.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.48</version>
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools.ddms</groupId>
+ <artifactId>ddmlib</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>5.0.3</version>
@@ -52,8 +64,20 @@
</dependency>
<dependency>
<groupId>com.android.tools.build</groupId>
- <artifactId>builder-model</artifactId>
- <version>2.0.0-beta4</version>
+ <artifactId>builder-test-api</artifactId>
+ <version>2.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.android.tools.jack</groupId>
+ <artifactId>jack-api</artifactId>
+ <version>0.9.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>sdk-common</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -63,21 +87,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>sdklib</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>testutils</artifactId>
- <version>25.0.0-beta4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.android.tools.jack</groupId>
- <artifactId>jack-api</artifactId>
- <version>0.9.0</version>
+ <groupId>com.android.tools.build</groupId>
+ <artifactId>manifest-merger</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -87,51 +99,39 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>sdk-common</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.android.tools.build</groupId>
- <artifactId>builder-test-api</artifactId>
- <version>2.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.jill</groupId>
- <artifactId>jill-api</artifactId>
- <version>0.9.0</version>
+ <groupId>com.android.tools</groupId>
+ <artifactId>common</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>testutils</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.48</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.build</groupId>
- <artifactId>manifest-merger</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<version>0.28</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.ddms</groupId>
- <artifactId>ddmlib</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>com.android.tools</groupId>
+ <artifactId>sdklib</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4-sources.jar
deleted file mode 100644
index 5a84b1b..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta7/gradle-api-2.0.0-beta7.jar
similarity index 74%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta7/gradle-api-2.0.0-beta7.jar
index 1350ecd..91bd1e5 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta7/gradle-api-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta7/gradle-api-2.0.0-beta7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta7/gradle-api-2.0.0-beta7.pom
index 15ef926..156f1bd 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta4/gradle-api-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta7/gradle-api-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.build</groupId>
<artifactId>gradle-api</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Android Gradle API</name>
<description>APIs to customize Android Gradle Builds</description>
<url>http://tools.android.com</url>
@@ -27,15 +27,15 @@
</scm>
<dependencies>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>17.0</version>
+ <groupId>com.android.tools</groupId>
+ <artifactId>annotations</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>annotations</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>17.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4-sources.jar
deleted file mode 100644
index 78a4fca..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta7/gradle-core-2.0.0-beta7.jar
similarity index 69%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta7/gradle-core-2.0.0-beta7.jar
index af7198e..bb1345e 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta7/gradle-core-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta7/gradle-core-2.0.0-beta7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta7/gradle-core-2.0.0-beta7.pom
index 36565a0..b7d04fe 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta4/gradle-core-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta7/gradle-core-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.build</groupId>
<artifactId>gradle-core</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Core Library for Android Gradle Plug-in</name>
<description>Core library to build Android Gradle plugin.</description>
<url>http://tools.android.com</url>
@@ -41,14 +41,20 @@
<dependency>
<groupId>com.android.tools.build</groupId>
<artifactId>builder</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>tools.base.instant-run</groupId>
- <artifactId>instant-run-annotations</artifactId>
- <version>unspecified</version>
- <scope>test</scope>
+ <groupId>com.android.tools.build</groupId>
+ <artifactId>gradle-api</artifactId>
+ <version>2.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.android.databinding</groupId>
+ <artifactId>compilerCommon</artifactId>
+ <version>2.0.0-beta7</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -57,39 +63,27 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.lint</groupId>
- <artifactId>lint</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>5.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>tools.base</groupId>
- <artifactId>project-test-lib</artifactId>
+ <groupId>tools.base.instant-run</groupId>
+ <artifactId>instant-run-runtime</artifactId>
<version>unspecified</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>testutils</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>tools.base.instant-run</groupId>
+ <artifactId>instant-run-annotations</artifactId>
+ <version>unspecified</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.build</groupId>
- <artifactId>gradle-api</artifactId>
- <version>2.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.android.databinding</groupId>
- <artifactId>compilerCommon</artifactId>
- <version>2.0.0-beta4</version>
+ <groupId>com.android.tools.lint</groupId>
+ <artifactId>lint</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -99,20 +93,26 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>net.sf.proguard</groupId>
- <artifactId>proguard-gradle</artifactId>
- <version>5.2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>tools.base.instant-run</groupId>
- <artifactId>instant-run-runtime</artifactId>
+ <groupId>net.sf.proguard</groupId>
+ <artifactId>proguard-gradle</artifactId>
+ <version>5.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>testutils</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>tools.base</groupId>
+ <artifactId>project-test-lib</artifactId>
<version>unspecified</version>
<scope>test</scope>
</dependency>
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4-sources.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4-sources.jar
deleted file mode 100644
index 53818ae..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta7/gradle-experimental-0.6.0-beta7.jar
similarity index 86%
rename from common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4.jar
rename to common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta7/gradle-experimental-0.6.0-beta7.jar
index 45746fd..ce22af0 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta7/gradle-experimental-0.6.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta7/gradle-experimental-0.6.0-beta7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4.pom
rename to common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta7/gradle-experimental-0.6.0-beta7.pom
index 3bd3751..5128c81 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta4/gradle-experimental-0.6.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta7/gradle-experimental-0.6.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.build</groupId>
<artifactId>gradle-experimental</artifactId>
- <version>0.6.0-beta4</version>
+ <version>0.6.0-beta7</version>
<name>Gradle Plug-in for Android Using Component Model</name>
<description>Gradle plug-in to build Android applications.</description>
<url>http://tools.android.com</url>
@@ -33,16 +33,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools.build</groupId>
+ <artifactId>gradle-core</artifactId>
+ <version>2.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>tools.base</groupId>
<artifactId>project-test-lib</artifactId>
<version>unspecified</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.android.tools.build</groupId>
- <artifactId>gradle-core</artifactId>
- <version>2.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4-sources.jar
deleted file mode 100644
index 5c8a48a..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4.jar b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta7/gradle-2.0.0-beta7.jar
similarity index 71%
rename from common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/build/gradle/2.0.0-beta7/gradle-2.0.0-beta7.jar
index 28ef779..37e30a1 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta7/gradle-2.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4.pom b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta7/gradle-2.0.0-beta7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/build/gradle/2.0.0-beta7/gradle-2.0.0-beta7.pom
index d03fbfe..8780fff 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta4/gradle-2.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta7/gradle-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.build</groupId>
<artifactId>gradle</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<name>Gradle Plug-in for Android</name>
<description>Gradle plug-in to build Android applications.</description>
<url>http://tools.android.com</url>
@@ -33,16 +33,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools.build</groupId>
+ <artifactId>gradle-core</artifactId>
+ <version>2.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>tools.base</groupId>
<artifactId>project-test-lib</artifactId>
<version>unspecified</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.android.tools.build</groupId>
- <artifactId>gradle-core</artifactId>
- <version>2.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4-sources.jar
deleted file mode 100644
index 733fe3a..0000000
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta7/manifest-merger-25.0.0-beta7.jar
similarity index 72%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta7/manifest-merger-25.0.0-beta7.jar
index 727eee3..aa2000b 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta7/manifest-merger-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta7/manifest-merger-25.0.0-beta7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta7/manifest-merger-25.0.0-beta7.pom
index 1a4ea76..090439e 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta4/manifest-merger-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta7/manifest-merger-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.build</groupId>
<artifactId>manifest-merger</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools Manifest Merger library</name>
<description>A Library to merge Android manifests.</description>
<url>http://tools.android.com</url>
@@ -33,30 +33,24 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>common</artifactId>
- <version>25.0.0-beta4</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>sdk-common</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>common</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
@@ -64,8 +58,14 @@
</dependency>
<dependency>
<groupId>com.android.tools</groupId>
+ <artifactId>sdk-common</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.android.tools</groupId>
<artifactId>sdklib</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4-sources.jar
deleted file mode 100644
index baf323f..0000000
--- a/common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/common/25.0.0-beta7/common-25.0.0-beta7.jar
similarity index 86%
rename from common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/common/25.0.0-beta7/common-25.0.0-beta7.jar
index 8532655..a050c23 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/common/25.0.0-beta7/common-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/common/25.0.0-beta7/common-25.0.0-beta7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/common/25.0.0-beta7/common-25.0.0-beta7.pom
index ed81e60..9bd8988 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-beta4/common-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/common/25.0.0-beta7/common-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools</groupId>
<artifactId>common</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools common library</name>
<description>common library used by other Android tools libraries.</description>
<url>http://tools.android.com</url>
@@ -27,15 +27,15 @@
</scm>
<dependencies>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>17.0</version>
+ <groupId>com.android.tools</groupId>
+ <artifactId>annotations</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>annotations</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>17.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4-sources.jar
deleted file mode 100644
index 4923a03..0000000
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta7/ddmlib-25.0.0-beta7.jar
similarity index 91%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta7/ddmlib-25.0.0-beta7.jar
index 061c2a9..fe42a03 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta7/ddmlib-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta7/ddmlib-25.0.0-beta7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta7/ddmlib-25.0.0-beta7.pom
index f418375..3a89ab6 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta4/ddmlib-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta7/ddmlib-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.ddms</groupId>
<artifactId>ddmlib</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools ddmlib</name>
<description>Library providing APIs to talk to Android devices</description>
<url>http://tools.android.com</url>
@@ -33,18 +33,18 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>common</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>common</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.1</version>
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4-sources.jar
deleted file mode 100644
index 3926d40..0000000
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta7/dvlib-25.0.0-beta7.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/dvlib/25.0.0-beta7/dvlib-25.0.0-beta7.jar
index 8efdae3..c8feb09 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta7/dvlib-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta7/dvlib-25.0.0-beta7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/dvlib/25.0.0-beta7/dvlib-25.0.0-beta7.pom
index 90f2928..a92bbd0 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta4/dvlib-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta7/dvlib-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools</groupId>
<artifactId>dvlib</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools dvlib</name>
<description>A Library to manage the Android device database XML files.</description>
<url>http://tools.android.com</url>
@@ -27,16 +27,16 @@
</scm>
<dependencies>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>common</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>common</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
index b6abbba..480ad57 100644
--- a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
+++ b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
index 1dd0c95..56391a9 100644
--- a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
+++ b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4-sources.jar
deleted file mode 100644
index 97dcd36..0000000
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta7/layoutlib-api-25.0.0-beta7.jar
similarity index 86%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta7/layoutlib-api-25.0.0-beta7.jar
index 7e7f2e0..71159aa 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta7/layoutlib-api-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta7/layoutlib-api-25.0.0-beta7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta7/layoutlib-api-25.0.0-beta7.pom
index 712723e..c1445d4 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta4/layoutlib-api-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta7/layoutlib-api-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.layoutlib</groupId>
<artifactId>layoutlib-api</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools layoutlib-api</name>
<description>Library to use the rendering library for Android layouts: layoutlib</description>
<url>http://tools.android.com</url>
@@ -27,30 +27,30 @@
</scm>
<dependencies>
<dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>annotations</artifactId>
+ <version>25.0.0-beta7</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>common</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>annotations</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>common</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>com.intellij</groupId>
<artifactId>annotations</artifactId>
<version>12.0</version>
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4-sources.jar
deleted file mode 100644
index a0643ee..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta7/lint-api-25.0.0-beta7.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta7/lint-api-25.0.0-beta7.jar
index de0e230..b953a79 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta7/lint-api-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta7/lint-api-25.0.0-beta7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta7/lint-api-25.0.0-beta7.pom
index 3a3e5a5..54a9128 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta4/lint-api-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta7/lint-api-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.lint</groupId>
<artifactId>lint-api</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools Lint API</name>
<description>API to build lint checks</description>
<url>http://tools.android.com</url>
@@ -27,9 +27,9 @@
</scm>
<dependencies>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>sdk-common</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>com.android.tools.build</groupId>
+ <artifactId>builder-model</artifactId>
+ <version>2.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -45,16 +45,16 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.build</groupId>
- <artifactId>builder-model</artifactId>
- <version>2.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.android.tools.external.lombok</groupId>
<artifactId>lombok-ast</artifactId>
<version>0.2.3</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>sdk-common</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4-sources.jar
deleted file mode 100644
index cb04ccf..0000000
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta7/lint-checks-25.0.0-beta7.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta7/lint-checks-25.0.0-beta7.jar
index dda3647..d639d00 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta7/lint-checks-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta7/lint-checks-25.0.0-beta7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta7/lint-checks-25.0.0-beta7.pom
index 1785e74..9a7d000 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta4/lint-checks-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta7/lint-checks-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.lint</groupId>
<artifactId>lint-checks</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Lint Checks</name>
<description>Checks for Android Lint</description>
<url>http://tools.android.com</url>
@@ -27,15 +27,15 @@
</scm>
<dependencies>
<dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-analysis</artifactId>
- <version>5.0.3</version>
+ <groupId>com.android.tools.lint</groupId>
+ <artifactId>lint-api</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.lint</groupId>
- <artifactId>lint-api</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>5.0.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4-sources.jar
deleted file mode 100644
index da4aafc..0000000
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta7/lint-25.0.0-beta7.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/lint/lint/25.0.0-beta7/lint-25.0.0-beta7.jar
index cce812a..76c4ccb 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta7/lint-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta7/lint-25.0.0-beta7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/lint/lint/25.0.0-beta7/lint-25.0.0-beta7.pom
index c942b39..8500051 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta4/lint-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta7/lint-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools.lint</groupId>
<artifactId>lint</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Lint Tool</name>
<description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
<url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
<dependency>
<groupId>com.android.tools.lint</groupId>
<artifactId>lint-checks</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4-sources.jar
deleted file mode 100644
index c528eea..0000000
--- a/common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/repository/25.0.0-beta7/repository-25.0.0-beta7.jar
similarity index 66%
rename from common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/repository/25.0.0-beta7/repository-25.0.0-beta7.jar
index 84e198f..ff0d116 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-beta7/repository-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/repository/25.0.0-beta7/repository-25.0.0-beta7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/repository/25.0.0-beta7/repository-25.0.0-beta7.pom
index 975be29..05b5140 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-beta4/repository-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-beta7/repository-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools</groupId>
<artifactId>repository</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools repository</name>
<description>A library for downloading and managing package repositories</description>
<url>http://tools.android.com</url>
@@ -27,18 +27,18 @@
</scm>
<dependencies>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>common</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>common</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.8.1</version>
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4-sources.jar
deleted file mode 100644
index 64484ad..0000000
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta7/sdk-common-25.0.0-beta7.jar
similarity index 90%
rename from common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/sdk-common/25.0.0-beta7/sdk-common-25.0.0-beta7.jar
index 2e95dc9..4c3fba2 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta7/sdk-common-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta7/sdk-common-25.0.0-beta7.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/sdk-common/25.0.0-beta7/sdk-common-25.0.0-beta7.pom
index 9a011c8..3a212c9 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta4/sdk-common-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta7/sdk-common-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools</groupId>
<artifactId>sdk-common</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools sdk-common library</name>
<description>sdk-common library used by other Android tools libraries.</description>
<url>http://tools.android.com</url>
@@ -27,10 +27,10 @@
</scm>
<dependencies>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>testutils</artifactId>
- <version>25.0.0-beta4</version>
- <scope>test</scope>
+ <groupId>com.android.tools.build</groupId>
+ <artifactId>builder-model</artifactId>
+ <version>2.0.0-beta7</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -53,14 +53,14 @@
<dependency>
<groupId>com.android.tools.build</groupId>
<artifactId>builder-test-api</artifactId>
- <version>2.0.0-beta4</version>
+ <version>2.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.build</groupId>
- <artifactId>builder-model</artifactId>
- <version>2.0.0-beta4</version>
- <scope>compile</scope>
+ <groupId>com.android.tools</groupId>
+ <artifactId>testutils</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -69,16 +69,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>sdklib</artifactId>
- <version>25.0.0-beta4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.48</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.android.tools</groupId>
+ <artifactId>sdklib</artifactId>
+ <version>25.0.0-beta7</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4-sources.jar b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4-sources.jar
deleted file mode 100644
index 2075050..0000000
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4.jar b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta7/sdklib-25.0.0-beta7.jar
similarity index 89%
rename from common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4.jar
rename to common/offline-m2/com/android/tools/sdklib/25.0.0-beta7/sdklib-25.0.0-beta7.jar
index fb5d2e5..ca5a8c1 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta7/sdklib-25.0.0-beta7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4.pom b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta7/sdklib-25.0.0-beta7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4.pom
rename to common/offline-m2/com/android/tools/sdklib/25.0.0-beta7/sdklib-25.0.0-beta7.pom
index 37613d9..7c4a6c6 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta4/sdklib-25.0.0-beta4.pom
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta7/sdklib-25.0.0-beta7.pom
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.android.tools</groupId>
<artifactId>sdklib</artifactId>
- <version>25.0.0-beta4</version>
+ <version>25.0.0-beta7</version>
<name>Android Tools sdklib</name>
<description>A library to parse and download the Android SDK.</description>
<url>http://tools.android.com</url>
@@ -28,14 +28,14 @@
<dependencies>
<dependency>
<groupId>com.android.tools</groupId>
- <artifactId>dvlib</artifactId>
- <version>25.0.0-beta4</version>
+ <artifactId>repository</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools.layoutlib</groupId>
- <artifactId>layoutlib-api</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>com.android.tools</groupId>
+ <artifactId>dvlib</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -69,9 +69,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>com.android.tools</groupId>
- <artifactId>repository</artifactId>
- <version>25.0.0-beta4</version>
+ <groupId>com.android.tools.layoutlib</groupId>
+ <artifactId>layoutlib-api</artifactId>
+ <version>25.0.0-beta7</version>
<scope>compile</scope>
</dependency>
</dependencies>
