Squashed 'libs/stores/' changes from 24c4d5b..e82d05e

e82d05e Merge pull request #22 from wordpress-mobile/issue/fix-maven-artifact-publishing f939d26 add _publishNonDefault true_ back - we'll need this for the subtree config 9bfb973 remove <application> from the library manifest e7a4381 minimum lib 14 (I haven't checked if we can do lower) bc0dd57 remove sonatype integration and use android-maven pluding instead git-subtree-dir: libs/stores git-subtree-split: e82d05ec65bda506e8c81e1e943a7e51b1291448
wordpress-mobile · Mar 15, 2016 · 5191ace · 5191ace
1 parent 24c4d5b
commit 5191ace
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 60 deletions.
diff --git a/WordPressStores/build.gradle b/WordPressStores/build.gradle
@@ -3,15 +3,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+      classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+      classpath 'com.android.tools.build:gradle:2.0.0-beta6'
+      classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'signing'
 apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'com.github.dcendents.android-maven'
 
 repositories {
     jcenter()
@@ -26,7 +26,7 @@ android {
     defaultConfig {
         versionCode 4
         versionName "0.1"
-        minSdkVersion 15
+        minSdkVersion 14
         targetSdkVersion 23
     }
     buildTypes {
@@ -66,58 +66,6 @@ dependencies {
     provided 'org.glassfish:javax.annotation:10.0-b28'
 }
 
-signing {
-    required {
-        project.properties.containsKey("signing.keyId") && project.properties.containsKey("signing.secretKeyRingFile")
-    }
-    sign configurations.archives
-}
-
 version android.defaultConfig.versionName
 group = "org.wordpress"
 archivesBaseName = "stores"
-
-// http://central.sonatype.org/pages/gradle.html
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: project.properties.ossrhUsername, password: project.properties.ossrhPassword)
-            }
-
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: project.properties.ossrhUsername, password: project.properties.ossrhPassword)
-            }
-
-            pom.project {
-                name 'WordPress-Android-Stores'
-                packaging 'aar'
-                description 'A reusable Android Stores for WordPress data'
-                url 'https://github.com/wordpress-mobile/WordPress-Stores-Android'
-                scm {
-                    connection 'scm:git:https://github.com/wordpress-mobile/WordPress-Stores-Android.git'
-                    developerConnection 'scm:git:https://github.com/wordpress-mobile/WordPress-Stores-Android.git'
-                    url 'https://github.com/wordpress-mobile/WordPress-Stores-Android'
-                }
-
-                licenses {
-                    license {
-                        name 'GPL v2'
-                        url 'http://opensource.org/licenses/GPL-2.0'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id 'maxme'
-                        name 'Maxime Biais'
-                        email 'maxime@automattic.com'
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/WordPressStores/src/main/AndroidManifest.xml b/WordPressStores/src/main/AndroidManifest.xml
@@ -3,7 +3,4 @@
     package="org.wordpress.android.stores" >
 
     <uses-permission android:name="android.permission.INTERNET" />
-
-    <application android:allowBackup="true" android:fullBackupContent="true">
-    </application>
 </manifest>
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,8 @@
+buildscript {
+   repositories {
+       jcenter()
+   }
+   dependencies {
+     classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+   }
+}