Keep InstrumentationTestCase in main dex am: b68f891c88 am: ed74391906 am: ba450e759c
am: 4f494eea21
Change-Id: Ibf6df76b1a35af6577ca95c982799a1282b9128a
diff --git a/build.gradle b/build.gradle
index 3a5ed75..10fac34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,9 +66,18 @@
// upload anchor for subprojects to upload their artifacts
// to the local repo.
-task(dist) {
+task dist(type: Zip) {
group = BasePlugin.BUILD_GROUP
description 'Builds distribution artifacts.'
+
+ from project.ext.supportRepoOut
+ into 'm2repository'
+ destinationDir project.ext.distDir
+ baseName = String.format("top-of-tree-m2repository-%s", project.multidexVersion)
+
+ doLast {
+ logger.warn "Compressed maven artifacts to ${archivePath}"
+ }
}
subprojects {
@@ -89,18 +98,7 @@
}
}
- task createArtifactZip(type: Zip, dependsOn: release) {
- from release.artifacts
- into archivesBaseName
- destinationDir project.parent.distDir
- baseName = archivesBaseName
-
- doLast {
- logger.warn "Compressed maven artifacts to ${archivePath}"
- }
- }
-
- dist.dependsOn createArtifactZip
+ dist.dependsOn release
project.plugins.whenPluginAdded { plugin ->
if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
index adea6d7..1e6fd98 100644
--- a/instrumentation/build.gradle
+++ b/instrumentation/build.gradle
@@ -17,7 +17,7 @@
apply plugin: 'com.android.library'
dependencies {
- compile project(':support-multidex')
+ compile project(':multidex')
}
android {
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
index 8da151d..781e6a7 100644
--- a/library/AndroidManifest.xml
+++ b/library/AndroidManifest.xml
@@ -15,5 +15,4 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.support.multidex">
- <meta-data android:name="android.support.VERSION" android:value="${multidex-version}" />
</manifest>
diff --git a/library/build.gradle b/library/build.gradle
index e882989..abb8c49 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -21,9 +21,6 @@
defaultConfig {
minSdkVersion 4
-
- // Update the version meta-data in Manifest.
- addManifestPlaceholders(["multidex-version": project.rootProject.ext.multidexVersion])
}
sourceSets {
diff --git a/settings.gradle b/settings.gradle
index 516f997..7fffc9b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-include ':support-multidex'
-project(':support-multidex').projectDir = new File(rootDir, 'library')
+include ':multidex'
+project(':multidex').projectDir = new File(rootDir, 'library')
-include ':support-multidex-instrumentation'
-project(':support-multidex-instrumentation').projectDir = new File(rootDir, 'instrumentation')
+include ':multidex-instrumentation'
+project(':multidex-instrumentation').projectDir = new File(rootDir, 'instrumentation')