Merge pull request #8 from aws-amplify/tjroach/publishing-updates

chore(all) Publishing updates

Author: tylerjroach

build.gradle

@@ -131,10 +131,7 @@ subprojects { project ->
 }
 
 private void configureAndroidLibrary(Project project) {
-    project.ext.VERSION_NAME = project.hasProperty('VERSION_NAME') ?
-            project.findProperty('VERSION_NAME') :
-            rootProject.findProperty('VERSION_NAME')
-
+    project.ext.VERSION_NAME = project.findProperty('VERSION_NAME')
     if (project.hasProperty('signingKeyId')) {
         System.out.println("Getting signing info from protected source.")
         project.ext.'signing.keyId' = findProperty('signingKeyId')
@@ -143,7 +140,6 @@ private void configureAndroidLibrary(Project project) {
     }
 
     project.android {
-        //buildToolsVersion rootProject.ext.buildToolsVersion
         compileSdkVersion rootProject.ext.compileSdkVersion
 
         defaultConfig {

configuration/publishing.gradle

@@ -17,8 +17,6 @@
 apply plugin: 'signing'
 apply plugin: 'maven-publish'
 
-version = project.ext.VERSION_NAME
-
 def isReleaseBuild() {
     return VERSION_NAME.contains("SNAPSHOT") == false
 }
@@ -42,25 +40,15 @@ def getRepositoryPassword() {
 }
 
 afterEvaluate { project ->
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.source
-    }
-
-
     publishing {
         publications {
             library(MavenPublication) {
                 groupId POM_GROUP
                 artifactId POM_ARTIFACT_ID
                 version VERSION_NAME
 
-                artifact("${buildDir}/outputs/aar/${artifactId}-release.aar")
-                if (project.getPlugins().hasPlugin('com.android.application') ||
-                        project.getPlugins().hasPlugin('com.android.library')) {
-                    artifact(androidSourcesJar)
-                } else {
-                    artifact(sourcesJar)
+                afterEvaluate {
+                    from(components["release"])
                 }
 
                 pom {
@@ -90,35 +78,6 @@ afterEvaluate { project ->
                             roles = ["developer"]
                         }
                     }
-
-                    withXml {
-                        def dependenciesNode = asNode().appendNode('dependencies')
-
-                        def apiDependencies = configurations.api.allDependencies
-
-                        // Dependency may exist in both api and implementation block.
-                        // Prioritize as api over implementation.
-                        def implementationDependencies =
-                                configurations.implementation.allDependencies.findAll {
-                                    !apiDependencies.contains(it)
-                                }
-
-                        apiDependencies.each {
-                            def dependencyNode = dependenciesNode.appendNode('dependency')
-                            dependencyNode.appendNode('groupId', it.group)
-                            dependencyNode.appendNode('artifactId', it.name)
-                            dependencyNode.appendNode('version', it.version)
-                            dependencyNode.appendNode('scope', "compile")
-                        }
-
-                        implementationDependencies.each {
-                            def dependencyNode = dependenciesNode.appendNode('dependency')
-                            dependencyNode.appendNode('groupId', it.group)
-                            dependencyNode.appendNode('artifactId', it.name)
-                            dependencyNode.appendNode('version', it.version)
-                            dependencyNode.appendNode('scope', "runtime")
-                        }
-                    }
                 }
             }
         }