From 2aa900a7787c4cd594dbd936cc022634b56a567d Mon Sep 17 00:00:00 2001
From: vsukharew <vadimsukharev1@yandex.ru>
Date: Tue, 26 Oct 2021 20:58:45 +0300
Subject: [PATCH] edited publishing script

---
 library/build.gradle                          |  2 +-
 ...maven-central.gradle => publishing.gradle} | 32 ++++++-------------
 2 files changed, 10 insertions(+), 24 deletions(-)
 rename scripts/{publish-maven-central.gradle => publishing.gradle} (78%)

diff --git a/library/build.gradle b/library/build.gradle
index e560770..f85a459 100644
--- 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 b/scripts/publishing.gradle
similarity index 78%
rename from scripts/publish-maven-central.gradle
rename to scripts/publishing.gradle
index a7d5ccb..ada10fe 100644
--- a/scripts/publish-maven-central.gradle
+++ b/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
+    }
 }
\ No newline at end of file