Clean up multidex gradle build, bump version to 1.0.2 for release

Bug: 36122649
Test: ./gradlew dist test connectedAndroidTest
Change-Id: I79578f683146a3ea16521cd090d113698a14c5f5

11 files changed, 26 insertions, 95 deletions

diff --git a/library/.classpath b/library/.classpath
deleted file mode 100644
index 7bc01d9..0000000
--- a/library/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/library/.project b/library/.project
deleted file mode 100644
index 566e709..0000000
--- a/library/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>android-support-multidex</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
index f29fe15..8da151d 100644
--- a/library/AndroidManifest.xml
+++ b/library/AndroidManifest.xml
@@ -15,5 +15,5 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="android.support.multidex">
-    <uses-sdk android:minSdkVersion="4"/>
+    <meta-data android:name="android.support.VERSION" android:value="${multidex-version}" />
 </manifest>
diff --git a/library/README.txt b/library/README
index 62e8737..62e8737 100644
--- a/library/README.txt
+++ b/library/README
diff --git a/library/README.android b/library/README.android
deleted file mode 100644
index 2fde7e2..0000000
--- a/library/README.android
+++ /dev/null
@@ -1,6 +0,0 @@
-Library Project including compatibility multi dex loader.
-
-This can be used by an Android project to install classloader
-with multiple dex of applications running on API 4+.
-
-
diff --git a/library/build.gradle b/library/build.gradle
index f04615d..e882989 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,9 +1,31 @@
-apply plugin: 'android-library'
-archivesBaseName = 'multidex'
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 4
 
+    defaultConfig {
+        minSdkVersion 4
+
+        // Update the version meta-data in Manifest.
+        addManifestPlaceholders(["multidex-version": project.rootProject.ext.multidexVersion])
+    }
+
     sourceSets {
         main {
             java.srcDirs         = ['src']
@@ -51,4 +73,4 @@ uploadArchives {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/library/project.properties b/library/project.properties
deleted file mode 100644
index 22e1c48..0000000
--- a/library/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-14
-android.library=true
diff --git a/library/res/.readme b/library/res/.readme
deleted file mode 100644
index cc903f6..0000000
--- a/library/res/.readme
+++ /dev/null
@@ -1 +0,0 @@
-This hidden file is there to ensure there is an res folder.
\ No newline at end of file
diff --git a/library/src/.readme b/library/src/.readme
deleted file mode 100644
index 4bcebad..0000000
--- a/library/src/.readme
+++ /dev/null
@@ -1,2 +0,0 @@
-This hidden file is there to ensure there is an src folder.
-Once we support binary library this will go away.
\ No newline at end of file
diff --git a/library/test/.classpath b/library/test/.classpath
deleted file mode 100644
index e3d0af0..0000000
--- a/library/test/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/android-support-multidex"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/library/test/.project b/library/test/.project
deleted file mode 100644
index 29f077e..0000000
--- a/library/test/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>android-support-multidex-tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>