[1.4.0-feature] 更新maven配置

crazyqiang · crazyqiang · commit 684cda141bc7 · 2021-10-26T21:01:59.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -2,15 +2,16 @@ apply from: 'config.gradle'
 
 buildscript {
     repositories {
-        maven {
-            url = uri("$rootDir/repo")
-        }
-        jcenter()
         google()
+        mavenCentral()
+        jcenter()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        maven {
+            url = uri("$rootDir/repo")
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -23,8 +24,9 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
+        jcenter()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
diff --git a/lib_dialog/build.gradle b/lib_dialog/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
 //apply from: 'dialog_publish.gradle'
 //apply plugin: 'com.novoda.bintray-release'//&#28155;&#21152;
 
diff --git a/lib_dialog/dialog_publish.gradle b/lib_dialog/dialog_publish.gradle
@@ -1,7 +1,3 @@
-//&#25945;&#31243;&#65306;https://juejin.cn/post/6951209116521988132
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
 task androidSourcesJar(type: Jar) {
     archiveClassifier.set("sources")
     from android.sourceSets.main.java.source
@@ -16,12 +12,13 @@ publishing {
             // group id&#65292;&#21457;&#24067;&#21518;&#24341;&#29992;&#30340;&#20381;&#36182;&#30340; group id
             groupId 'io.github.fantastic'
             // &#21457;&#24067;&#21518;&#24341;&#29992;&#30340;&#20381;&#36182;&#30340; artifact id
-            artifactId 'lib_common_dialog'
+            artifactId 'lib_dialog'
             // &#21457;&#24067;&#30340;&#29256;&#26412;
             version '1.2.0'
             // &#21457;&#24067;&#30340; arr &#30340;&#25991;&#20214;&#21644;&#28304;&#30721;&#25991;&#20214;
             artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
             artifact androidSourcesJar
+            artifact generateJavadoc //&#38656;&#35201;&#19978;&#20256;&#30340;java doc
             pom {
                 // &#26500;&#20214;&#21517;&#31216;&#65292;&#21487;&#20197;&#33258;&#23450;&#20041;
                 name = 'dialog-common'
@@ -87,10 +84,16 @@ publishing {
             def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
             def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+
+            // maven &#23545;&#24212;&#30340;&#29992;&#25143;&#21517;&#21644;&#23494;&#30721;&#33258;&#23450;&#20041;&#23384;&#22312; local.properties &#25991;&#20214;&#20013;
+            Properties properties = new Properties()
+            properties.load(project.rootProject.file('local.properties').newDataInputStream())
+            def mavenUser = properties.getProperty("sonatypeUsername")
+            def mavenPassword = properties.getProperty("sonatypePassword")
             credentials {
                 // &#36825;&#37324;&#23601;&#26159;&#20043;&#21069;&#22312; issues.sonatype.org &#27880;&#20876;&#30340;&#36134;&#21495;
-                username ossrhUsername
-                password ossrhPassword
+                username mavenUser
+                password mavenPassword
             }
         }
     }
