chore:重新整理上传工具~~

Author: wangshuwen15222

gradle.properties

@@ -18,7 +18,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 debug=false
-pluginVersion=1.0.9
+pluginVersion=1.1.0
 annotationVersion=1.0.9
 compilerVersion=1.0.9
 coreVersion=1.1.0

publish-mavencentral.gradle

@@ -29,70 +29,73 @@ if (secretPropsFile.exists()) {
     println "No props file, loading env vars"
 }
 
+def configurePublication = { MavenPublication publication ->
+    groupId PUBLISH_GROUP_ID
+    artifactId PUBLISH_ARTIFACT_ID
+    version PUBLISH_VERSION
 
-publishing {
-    publications {
-        release(MavenPublication) {
-            groupId PUBLISH_GROUP_ID
-            artifactId PUBLISH_ARTIFACT_ID
-            version PUBLISH_VERSION
+    def uploadJar = "mavenJava" == publication.name
+    if (uploadJar) {
+        from components.java
+        artifact sourcesJar
+        artifact javadocJar
+    } else {
+        artifact tasks.getByName("bundleReleaseAar")
+        artifact androidSourcesJar
+    }
 
-            if (isAar) {
-                afterEvaluate { artifact(tasks.getByName("bundleReleaseAar")) }
-                artifact androidSourcesJar
-            } else {
-                components.java
-                artifact sourcesJar
-                artifact javadocJar
+    pom {
+        name = PUBLISH_ARTIFACT_ID
+        description = 'XRouter-Android'
+        url = 'https://github.com/wangshuwen1107/XRouter-Android.git'
+        licenses {
+            license {
+                //协议类型，一般默认Apache License2.0的话不用改：
+                name = 'The Apache License, Version 2.0'
+                url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
             }
-
-            pom {
-                name = PUBLISH_ARTIFACT_ID
-                description = 'XRouter-Android'
-                url = 'https://github.com/wangshuwen1107/XRouter-Android.git'
-                licenses {
-                    license {
-                        //协议类型，一般默认Apache License2.0的话不用改：
-                        name = 'The Apache License, Version 2.0'
-                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id = 'wangshuwen1107'
-                        name = 'wangshuwen1107'
-                        email = 'wnwn7375@outlook.com'
-                    }
-                }
-                // Version control info, if you're using GitHub, follow the format as seen here
-                scm {
-                    connection = 'scm:git:github.com/wangshuwen1107/XRouter-Android.git'
-                    developerConnection = 'scm:git:ssh://github.com/wangshuwen1107/XRouter-Android.git'
-                    url = 'https://github.com/wangshuwen1107/XRouter-Android.git/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 {
-                        if (null != it.group && null != it.name && null != it.version) {
-                            def dependencyNode = dependenciesNode.appendNode('dependency')
-                            dependencyNode.appendNode('groupId', it.group)
-                            dependencyNode.appendNode('artifactId', it.name)
-                            dependencyNode.appendNode('version', it.version)
-                        }
+        }
+        developers {
+            developer {
+                id = 'wangshuwen1107'
+                name = 'wangshuwen1107'
+                email = 'wnwn7375@outlook.com'
+            }
+        }
+        scm {
+            connection = 'scm:git:github.com/wangshuwen1107/XRouter-Android.git'
+            developerConnection = 'scm:git:ssh://github.com/wangshuwen1107/XRouter-Android.git'
+            url = 'https://github.com/wangshuwen1107/XRouter-Android.git/master'
+        }
+        withXml {
+            if (!uploadJar) {
+                def dependenciesNode = asNode().appendNode('dependencies')
+                project.configurations.implementation.allDependencies.each {
+                    if (null != it.group && null != it.name && null != it.version) {
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('groupId', it.group)
+                        dependencyNode.appendNode('artifactId', it.name)
+                        dependencyNode.appendNode('version', it.version)
                     }
                 }
             }
         }
     }
-    repositories {
-        // The repository to publish to, Sonatype/MavenCentral
-        maven {
-            // This is an arbitrary name, you may also use "mavencentral" or
-            // any other name that's descriptive for you
-            // name = "XRouter-Android"
-            url = uri('../repo')
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            if (isAar) {
+                release(MavenPublication, configurePublication)
+            } else {
+                mavenJava(MavenPublication, configurePublication)
+            }
+        }
+        repositories {
+            maven {
+                url = uri('../repo')
+            }
         }
     }
 }
@@ -102,7 +105,8 @@ signing {
     sign publishing.publications
 }
 
-task zipRepo(type: Zip) {
+task zipRepo(type: Zip ) {
+    dependsOn isAar ? 'publishReleasePublicationToMavenRepository' : 'publishMavenJavaPublicationToMavenRepository'
     def componentDirPath = "${PUBLISH_GROUP_ID.replace(".", "/")}/$PUBLISH_ARTIFACT_ID/$PUBLISH_VERSION"
 
     archiveBaseName = PUBLISH_ARTIFACT_ID
@@ -114,9 +118,9 @@ task zipRepo(type: Zip) {
     }
 }
 
-
-task publishSonatype(dependsOn: ['publishReleasePublicationToMavenRepository', 'zipRepo']) {
+task publishSonatype {
     group = "publishing"
+    dependsOn 'zipRepo'
     doLast {
         def publishZipFile = file("../publish/$PUBLISH_ARTIFACT_ID-$PUBLISH_VERSION" + ".zip")
         def uploadToken = Base64.getEncoder().encodeToString("$ossrhUsername:$ossrhPassword".getBytes("UTF-8"))