Merge pull request #499 from qiniu/update_mvn_push

Update mvn push
qiniu · Jul 3, 2023 · 689f237 · 689f237
2 parents 29d4e83 + ff39ca0
commit 689f237
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 76 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 #Changelog
 ## 8.5.3(2023-06-26)
 * 优化：
-  * 对 Dns 预解析和网络检测中的默认域名进行 Base64 处理  
+  * 对 Dns 预解析和网络检测中的默认域名进行 Base64 处理
+  * maven 发布脚本更新
 
 ## 8.5.2(2022-11-24)
 * 升级 HappyDns 依赖至 v2.0.1

diff --git a/gradle.properties b/gradle.properties
@@ -13,3 +13,5 @@ POM_LICENCE_URL=http://opensource.org/licenses/MIT
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=qiniu
 POM_DEVELOPER_NAME=Qiniu
+POM_INCEPTION_YEAR=2012
+POM_EMAIL[email protected]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Sep 20 17:18:12 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/library/gradle.properties b/library/gradle.properties
@@ -1,4 +1,4 @@
-POM_NAME=qiniu-android-sdk library
+POM_NAME=qiniu-android-sdk-library
 POM_ARTIFACT_ID=qiniu-android-sdk
 POM_PACKAGING=aar
 android.debug.obsoleteApi=true

diff --git a/mvn_push.gradle b/mvn_push.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 def isReleaseBuild() {
@@ -39,79 +39,84 @@ def getRepositoryPassword() {
     return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
 }
 
-afterEvaluate { project ->
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+task androidJavadocs(type: Javadoc) {
+    failOnError = false
+    source = android.sourceSets.main.java.srcDirs
+    options.encoding = "UTF-8"
+    options.charSet = 'UTF-8'
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
 
-                pom.groupId = GROUP
-                pom.artifactId = POM_ARTIFACT_ID
-                pom.version = VERSION_NAME
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    classifier = 'javadoc'
+    from androidJavadocs.destinationDir
+}
 
-                repository(url: getReleaseRepositoryUrl()) {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                }
-                snapshotRepository(url: getSnapshotRepositoryUrl()) {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                }
+task androidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.sourceFiles
+}
 
-                pom.project {
-                    name POM_NAME
-                    packaging POM_PACKAGING
-                    description POM_DESCRIPTION
-                    url POM_URL
+publishing {
+    publications{
+        mavenJava(MavenPublication){
+            groupId = GROUP
+            artifactId = POM_ARTIFACT_ID
+            version = VERSION_NAME
 
-                    scm {
-                        url POM_SCM_URL
-                        connection POM_SCM_CONNECTION
-                        developerConnection POM_SCM_DEV_CONNECTION
-                    }
+            artifact androidSourcesJar {
+                classifier = 'sources'
+            }
+
+            artifact androidJavadocsJar {
+                classifier "javadoc"
+            }
 
-                    licenses {
-                        license {
-                            name POM_LICENCE_NAME
-                            url POM_LICENCE_URL
-                            distribution POM_LICENCE_DIST
-                        }
+            pom {
+                name = POM_NAME
+                description = POM_DESCRIPTION
+                url = POM_URL
+                inceptionYear = POM_INCEPTION_YEAR
+
+                licenses {
+                    license {
+                        name = POM_LICENCE_NAME
+                        url = POM_LICENCE_URL
                     }
+                }
 
-                    developers {
-                        developer {
-                            id POM_DEVELOPER_ID
-                            name POM_DEVELOPER_NAME
-                        }
+                developers {
+                    developer {
+                        id = POM_DEVELOPER_ID
+                        name = POM_DEVELOPER_NAME
+                        email = POM_EMAIL
                     }
                 }
+
+                scm {
+                    connection= POM_SCM_CONNECTION
+                    developerConnection=POM_SCM_DEV_CONNECTION
+                    url=POM_SCM_URL
+                }
             }
         }
     }
 
-    signing {
-        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-        sign configurations.archives
-    }
-
-    task androidJavadocs(type: Javadoc) {
-        failOnError = false
-        source = android.sourceSets.main.java.srcDirs
-        options.encoding = "UTF-8"
-        options.charSet = 'UTF-8'
-        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    }
-
-    task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-        classifier = 'javadoc'
-        from androidJavadocs.destinationDir
+    repositories {
+        maven {
+            name = POM_NAME
+            url = getReleaseRepositoryUrl()
+            credentials {
+                username = getRepositoryUsername()
+                password = getRepositoryPassword()
+            }
+        }
     }
 
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.sourceFiles
-    }
+}
 
-    artifacts {
-        archives androidSourcesJar
-        archives androidJavadocsJar
-    }
+            
+signing {
+    required { isReleaseBuild()}
+    sign publishing.publications.mavenJava
 }