moar upgrade nonsense

marvinlabs · Mar 19, 2015 · 334a482 · 334a482
1 parent 102bde0
commit 334a482
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,4 @@
 ANDROID_BUILD_MIN_SDK_VERSION=15
 ANDROID_BUILD_TARGET_SDK_VERSION=20
 ANDROID_BUILD_TOOLS_VERSION=20.0.0
-ANDROID_BUILD_SDK_VERSION=20
+ANDROID_BUILD_SDK_VERSION=20
diff --git a/library/build.gradle b/library/build.gradle
@@ -7,12 +7,12 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.dcendents:android-maven-plugin:1.0'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'android-maven'
+apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'signing'
 
 android {
@@ -48,14 +48,6 @@ android.libraryVariants.all { variant ->
         description "Generates Javadoc for $variant.name."
         source = variant.javaCompile.source
 
-        if (android.plugin.hasProperty("sdkHandler")) {
-            androidPath = "${android.plugin.sdkHandler.sdkFolder}"
-        } else {
-            androidPath = "${android.plugin.sdkDirectory}"
-        }
-
-        ext.androidJar = androidPath + "/platforms/${android.compileSdkVersion}/android.jar"
-        classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
     }
 
     task("bundleJavadoc${variant.name.capitalize()}", type: Jar) {

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.marvinlabs.widget.floatinglabel">
 
+
     <application>
     </application>