chore:更新traget=30&&发布到central.sonatype.com

Author: wangshuwen15222

.gitignore

@@ -7,4 +7,5 @@
 /captures
 .externalNativeBuild
 .cxx
-/repo
+/repo
+/publish

app/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'XRouter'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
         applicationId "cn.cheney.test"
-        minSdkVersion 21
-        targetSdkVersion 29
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

build.gradle

@@ -25,4 +25,14 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
+    delete "./repo"
+    delete "./publish"
+}
+
+
+ext {
+    compileSdkVersion = 30
+    buildToolsVersion = '30.0.3'
+    minSdkVersion = 21
+    targetSdkVersion = 30
 }

gradle.properties

@@ -17,9 +17,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-
-debug = false
-pluginVersion = 1.0.8
-annotationVersion = 1.0.8
-compilerVersion = 1.0.8
-coreVersion = 1.0.9
+debug=false
+pluginVersion=1.0.9
+annotationVersion=1.0.9
+compilerVersion=1.0.9
+coreVersion=1.1.0

m_test/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
-
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
 

publish-mavencentral.gradle

@@ -18,24 +18,18 @@ if (isAar) {
     }
 }
 
-ext["signing.keyId"] = ''
-ext["signing.password"] = ''
-ext["signing.secretKeyRingFile"] = ''
-ext["ossrhUsername"] = ''
-ext["ossrhPassword"] = ''
-
 File secretPropsFile = project.rootProject.file('local.properties')
 if (secretPropsFile.exists()) {
     println "Found secret props file, loading props"
     Properties p = new Properties()
     p.load(new FileInputStream(secretPropsFile))
-    p.each { name, value ->
-        ext[name] = value
+    p.each { name, value -> ext[name] = value
     }
 } else {
     println "No props file, loading env vars"
 }
 
+
 publishing {
     publications {
         release(MavenPublication) {
@@ -44,10 +38,10 @@ publishing {
             version PUBLISH_VERSION
 
             if (isAar) {
-                artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
+                afterEvaluate { artifact(tasks.getByName("bundleReleaseAar")) }
                 artifact androidSourcesJar
             } else {
-                artifact("$buildDir/libs/${project.getName()}.jar")
+                components.java
                 artifact sourcesJar
                 artifact javadocJar
             }
@@ -74,14 +68,12 @@ publishing {
                 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')
@@ -99,22 +91,54 @@ publishing {
         maven {
             // This is an arbitrary name, you may also use "mavencentral" or
             // any other name that's descriptive for you
-            name = "XRouter-Android"
-
-            def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
-            def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-            // You only need this if you want to publish snapshots, otherwise just set the URL
-            // to the release repo directly
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-
-            // The username and password we've fetched earlier
-            credentials {
-                username ossrhUsername
-                password ossrhPassword
-            }
+            // name = "XRouter-Android"
+            url = uri('../repo')
         }
     }
 }
+
+
 signing {
     sign publishing.publications
 }
+
+task zipRepo(type: Zip) {
+    def componentDirPath = "${PUBLISH_GROUP_ID.replace(".", "/")}/$PUBLISH_ARTIFACT_ID/$PUBLISH_VERSION"
+
+    archiveBaseName = PUBLISH_ARTIFACT_ID
+    archiveVersion = PUBLISH_VERSION
+    destinationDirectory = file("../publish")
+
+    from("${rootProject.projectDir}/repo/$componentDirPath") {
+        into("$componentDirPath")
+    }
+}
+
+
+task publishSonatype(dependsOn: ['publishReleasePublicationToMavenRepository', 'zipRepo']) {
+    group = "publishing"
+    doLast {
+        def publishZipFile = file("../publish/$PUBLISH_ARTIFACT_ID-$PUBLISH_VERSION" + ".zip")
+        def uploadToken = Base64.getEncoder().encodeToString("$ossrhUsername:$ossrhPassword".getBytes("UTF-8"))
+        println "发布 uploadToken=$uploadToken"
+        println "发布 bundle=${publishZipFile.absolutePath}"
+        def curlOutput = new ByteArrayOutputStream()
+        def curlError = new ByteArrayOutputStream()
+        try {
+            exec {
+                commandLine 'curl', '--request', 'POST',
+                        '--header', "Authorization: Bearer $uploadToken",
+                        '--form', "bundle=@${publishZipFile.absolutePath}",
+                        '--form', "publishingType=AUTOMATIC",
+                        //'--form', "publishingType=USER_MANAGED",
+                        'https://central.sonatype.com/api/v1/publisher/upload'
+                standardOutput = curlOutput
+                errorOutput = curlError
+            }
+            println "发布结果*********: ${curlOutput.toString()}"
+        } catch (Exception e) {
+            println "发布失败*********: ${curlError.toString()}"
+            throw e
+        }
+    }
+}

xrouter_compiler/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'java-library'
 ext {
     PUBLISH_GROUP_ID = "io.github.wangshuwen1107"
     PUBLISH_ARTIFACT_ID = 'xrouter-compiler'
-    PUBLISH_VERSION = "$coreVersion"
+    PUBLISH_VERSION = "$compilerVersion"
 }
 apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
 

xrouter_compiler/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -8,15 +8,14 @@ ext {
 apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
 
@@ -35,13 +34,14 @@ android {
 }
 
 
+
 dependencies {
-    api 'com.alibaba:fastjson:1.2.23'
+    implementation 'com.alibaba:fastjson:1.2.23'
     implementation 'androidx.annotation:annotation:1.1.0'
-    if(debug == "true"){
-        api project(":xrouter_annotation")
-    }else {
-        api "io.github.wangshuwen1107:xrouter-annotation:$annotationVersion"
+    if (debug == "true") {
+        implementation project(":xrouter_annotation")
+    } else {
+        implementation "io.github.wangshuwen1107:xrouter-annotation:$annotationVersion"
     }
 }
 

xrouter_core/build.gradle

@@ -1,8 +1,9 @@
 plugins {
+    id 'java-library'
     id 'groovy'
-    id 'maven'
 }
 
+
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
@@ -23,16 +24,3 @@ ext {
     PUBLISH_VERSION = "$pluginVersion"
 }
 apply from: "${rootProject.projectDir}/publish-mavencentral.gradle"
-
-//debug本地调试
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.groupId = 'io.github.wangshuwen1107'
-            pom.artifactId = 'xrouter-plugin'
-            pom.version = "$pluginVersion"
-            //发布到本地repo 测试时候用
-            repository(url: uri('../repo'))
-        }
-    }
-}