Merge pull request #78 from vsukharew/dev-edit-publishing-script

edited publishing script
vsukharew · Oct 26, 2021 · eeff1d6 · eeff1d6
2 parents 3eca95e + 2aa900a
commit eeff1d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply from: '../dependencies.gradle'
-apply from: "../scripts/publish-maven-central.gradle"
+apply from: "../scripts/publishing.gradle"
 
 android {
     compileSdkVersion build.compileSdkVersion

diff --git a/scripts/publish-maven-central.gradle → scripts/publishing.gradle b/scripts/publish-maven-central.gradle → scripts/publishing.gradle
@@ -1,6 +1,6 @@
-task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.source
+tasks.register("androidSourcesJar", Jar) {
+    from android.sourceSets.main.java.srcDirs
+    archiveClassifier.set('sources')
 }
 
 artifacts {
@@ -39,16 +39,15 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
+                from components.release
+                artifact androidSourcesJar
+
                 // The coordinates of the library, being set from variables that
                 // we'll set up in a moment
                 groupId build.library.publishGroupId
                 artifactId build.library.publishArtifactId
                 version build.library.versionName
 
-                // Two artifacts, the `aar` and the sources
-                artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
-                artifact androidSourcesJar
-
                 // Self-explanatory metadata for the most part
                 pom {
                     name = build.library.publishArtifactId
@@ -74,18 +73,6 @@ afterEvaluate {
                         developerConnection = 'scm:git:ssh://github.com/vsukharew/AnyTypeAdapter'
                         url = 'https://github.com/vsukharew/AnyTypeAdapter/tree/master'
                     }
-                    // A slightly hacky fix so that your POM will include any transitive dependencies
-                    // that your library builds upon
-                    withXml {
-                        def dependenciesNode = asNode().appendNode('dependencies')
-
-                        project.configurations.implementation.allDependencies.each {
-                            def dependencyNode = dependenciesNode.appendNode('dependency')
-                            dependencyNode.appendNode('groupId', it.group)
-                            dependencyNode.appendNode('artifactId', it.name)
-                            dependencyNode.appendNode('version', it.version)
-                        }
-                    }
                 }
             }
         }
@@ -111,8 +98,7 @@ afterEvaluate {
             }
         }
     }
-}
-
-signing {
-    sign publishing.publications
+    signing {
+        sign publishing.publications
+    }
 }