feat: 增加requestCode

wzbos · wzbos · commit 4c8bdf1cee65 · 2021-07-01T21:56:40.000+08:00
diff --git a/bintray.gradle b/bintray.gradle
@@ -1,71 +1,129 @@
-apply plugin: 'com.jfrog.bintray'
+if (!rudolph_version.contains("SNAPSHOT")) {
+    apply plugin: 'com.jfrog.bintray'
+    apply plugin: 'com.github.dcendents.android-maven'
+    version = rudolph_version
+    group = publishedGroupId                               // Maven Group ID for the artifact
 
-version = rudolph_version
+    install {
+        repositories.mavenInstaller {
+            // This generates POM.xml with proper parameters
+            pom {
+                project {
+                    packaging 'aar'
+                    groupId publishedGroupId
+                    artifactId artifact
 
-if (project.hasProperty("android")) {
-    // Android libraries
-    task sourcesJar(type: Jar) {
-        archiveClassifier.set('sources')
-        from android.sourceSets.main.java.srcDirs
-    }
+                    // Add your description here
+                    name libraryName
+                    description libraryDescription
+                    url siteUrl
+
+                    // Set your license
+                    licenses {
+                        license {
+                            name licenseName
+                            url licenseUrl
+                        }
+                    }
+                    developers {
+                        developer {
+                            id developerId
+                            name developerName
+                            email developerEmail
+                        }
+                    }
+                    scm {
+                        connection gitUrl
+                        developerConnection gitUrl
+                        url siteUrl
 
-    task javadoc(type: Javadoc) {
-        failOnError = false
-        source = android.sourceSets.main.java.srcDirs
-        options {
-            encoding 'utf-8'
-            charSet 'utf-8'
-            links 'http://docs.oracle.com/javase/7/docs/api/'
-            linksOffline "https://developer.android.com/reference", "${android.sdkDirectory}/docs/reference"
+                    }
+                }
+            }
         }
-        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     }
-} else {
-    // Java libraries
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        archiveClassifier.set('sources')
-        from sourceSets.main.allSource
+
+    if (project.hasProperty("android")) {
+        // Android libraries
+        task sourcesJar(type: Jar) {
+            archiveClassifier.set('sources')
+            from android.sourceSets.main.java.srcDirs
+        }
+
+        task javadoc(type: Javadoc) {
+            failOnError = false
+            source = android.sourceSets.main.java.srcDirs
+            options {
+                encoding 'utf-8'
+                charSet 'utf-8'
+                links 'http://docs.oracle.com/javase/7/docs/api/'
+                linksOffline "https://developer.android.com/reference", "${android.sdkDirectory}/docs/reference"
+            }
+            classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        }
+    } else {
+        // Java libraries
+        task sourcesJar(type: Jar, dependsOn: classes) {
+            archiveClassifier.set('sources')
+            from sourceSets.main.allSource
+        }
     }
-}
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set('javadoc')
-    from javadoc.destinationDir
-}
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        archiveClassifier.set('javadoc')
+        from javadoc.destinationDir
+    }
 
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
+    artifacts {
+        archives javadocJar
+        archives sourcesJar
+    }
 
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+    Properties properties = new Properties()
+    properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
 // bintray
-bintray {
-    user = properties.getProperty('bintray.user')
-    key = properties.getProperty('bintray.apikey')
-    //    userOrg = properties.getProperty("bintray.org")
+    bintray {
+        user = properties.getProperty('bintray.user')
+        key = properties.getProperty('bintray.apikey')
+        //    userOrg = properties.getProperty("bintray.org")
 
-    configurations = ['archives']
-    override = true
+        configurations = ['archives']
+        override = true
 
-    pkg {
-        repo = bintrayRepo
-        name = bintrayName
-        desc = libraryDescription
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        //        userOrg = userOrg
-        licenses = ["Apache-2.0"]
-        publish = true
-        publicDownloadNumbers = true
-        dryRun = false
-        version {
-            name = libraryVersion
+        pkg {
+            repo = bintrayRepo
+            name = bintrayName
             desc = libraryDescription
-            released = new Date()
-            vcsTag = libraryVersion
+            websiteUrl = siteUrl
+            vcsUrl = gitUrl
+            //        userOrg = userOrg
+            licenses = ["Apache-2.0"]
+            publish = true
+            publicDownloadNumbers = true
+            dryRun = false
+            version {
+                name = libraryVersion
+                desc = libraryDescription
+                released = new Date()
+                vcsTag = libraryVersion
+            }
+        }
+    }
+} else {
+    apply plugin: 'maven'
+    uploadArchives {
+        try {
+            repositories {
+                mavenDeployer {
+                    snapshotRepository(url: uri("${System.getenv('HOME')}/repository/maven-snapshots"))
+                    pom.groupId = publishedGroupId
+                    pom.artifactId = artifact
+                    pom.version = chihiro_version
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace()
         }
     }
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -19,11 +19,11 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@ siteUrl=https://github.com/wzbos/Android-Rudolph-Router
 gitUrl=https://github.com/wzbos/Android-Rudolph-Router.git
 licenseName=The Apache Software License, Version 2.0
 licenseUrl=http://www.apache.org/licenses/LICENSE-2.0.txt
-rudolph_version=2.0.2
+rudolph_version=2.0.3-SNAPSHOT
 developerId=wzbos
 developerName=zongbo.wu
 developerEmail=sckoo@163.com
diff --git a/install.gradle b/install.gradle
diff --git a/rudolph-annotations/build.gradle b/rudolph-annotations/build.gradle
@@ -18,8 +18,7 @@ compileJava {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.72"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.4.20"
 }
 
-apply from: '../install.gradle'
 apply from: '../bintray.gradle'
diff --git a/rudolph-compiler/build.gradle b/rudolph-compiler/build.gradle
@@ -26,5 +26,4 @@ dependencies {
 //    implementation "${publishedGroupId}:rudolph-annotations:${rudolph_version}"
 }
 
-apply from: '../install.gradle'
 apply from: '../bintray.gradle'
diff --git a/rudolph/build.gradle b/rudolph/build.gradle
@@ -43,7 +43,6 @@ dependencies {
 //    api "${publishedGroupId}:rudolph-annotations:${rudolph_version}"
 }
 
-apply from: '../install.gradle'
 apply from: '../bintray.gradle'
 //apply from: 'publish.gradle'
 
diff --git a/rudolph/src/main/java/cn/wzbos/android/rudolph/router/ActivityRouter.kt b/rudolph/src/main/java/cn/wzbos/android/rudolph/router/ActivityRouter.kt
@@ -20,6 +20,9 @@ class ActivityRouter : Router<Any?> {
         private set
     var exitAnim = -1
         private set
+    var requestCode = -1
+        private set
+
 
     internal constructor(builder: RouteBuilder<*, *>) : super(builder)
     private constructor(builder: Builder<*>) : super(builder) {
@@ -81,6 +84,7 @@ class ActivityRouter : Router<Any?> {
      * startForResult for android.app.Fragment
      */
     fun startForResult(fragment: Fragment, requestCode: Int) {
+        this.requestCode = requestCode
         if (super.intercept(fragment.activity)) return
         val intent = getIntent(fragment.activity) ?: return
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
@@ -95,6 +99,7 @@ class ActivityRouter : Router<Any?> {
      * startForResult for android.support.v4.app.Fragment
      */
     fun startForResult(fragmentV4: android.support.v4.app.Fragment, requestCode: Int) {
+        this.requestCode = requestCode
         if (super.intercept(fragmentV4.context)) return
         val intent = getIntent(fragmentV4.context) ?: return
         fragmentV4.startActivityForResult(intent, requestCode)
@@ -105,6 +110,7 @@ class ActivityRouter : Router<Any?> {
      * startForResult for Activity
      */
     fun startForResult(activity: Activity, requestCode: Int) {
+        this.requestCode = requestCode
         if (super.intercept(activity)) return
         val intent = getIntent(activity) ?: return
         activity.startActivityForResult(intent, requestCode, options)
@@ -123,13 +129,13 @@ class ActivityRouter : Router<Any?> {
      */
     @Suppress("UNCHECKED_CAST")
     open class Builder<T : Builder<T>?> : RouteBuilder<Builder<T>?, ActivityRouter?> {
-         var options: Bundle? = null
+        var options: Bundle? = null
             private set
-         var flags = -1
+        var flags = -1
             private set
         var enterAnim = 0
             private set
-         var exitAnim = 0
+        var exitAnim = 0
             private set
 
 

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ buildscript {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`dependencies {`
`22`		`- classpath 'com.android.tools.build:gradle:4.0.1'`
	`22`	`+ classpath 'com.android.tools.build:gradle:4.0.2'`
`23`	`23`	`classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'`
`24`	`24`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"`
`25`	`25`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`26`		`- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'`
	`26`	`+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@ compileJava {`
`18`	`18`
`19`	`19`	`dependencies {`
`20`	`20`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"`
`21`		`- implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.72"`
	`21`	`+ implementation "org.jetbrains.kotlin:kotlin-reflect:1.4.20"`
`22`	`22`	`}`
`23`	`23`
`24`		`-apply from: '../install.gradle'`
`25`	`24`	`apply from: '../bintray.gradle'`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,4 @@ dependencies {`
`26`	`26`	`// implementation "${publishedGroupId}:rudolph-annotations:${rudolph_version}"`
`27`	`27`	`}`
`28`	`28`
`29`		`-apply from: '../install.gradle'`
`30`	`29`	`apply from: '../bintray.gradle'`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ dependencies {`
`43`	`43`	`// api "${publishedGroupId}:rudolph-annotations:${rudolph_version}"`
`44`	`44`	`}`
`45`	`45`
`46`		`-apply from: '../install.gradle'`
`47`	`46`	`apply from: '../bintray.gradle'`
`48`	`47`	`//apply from: 'publish.gradle'`
`49`	`48`