Merge pull request #89 from chenenyu/dev

1.4.3
chenenyu · Jun 11, 2018 · deca602 · deca602
2 parents 7deb946 + 6c3e17b
commit deca602
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 234 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,23 @@
+## 2018.06.11
+
+`router:1.4.3`:
+
+Optimize implementation in for multi-thread call.
+优化多线程下并发调用的解决方式。
+
 ## 2018.05.18
 
 `router:1.4.2`:
 
-1. Ordered interceptors.
+Ordered interceptors.
+拦截器现在是有序的。
 
 ## 2018.04.03
 
 `router:1.4.1`:
 
-1. fix ClassCastException in muilti-thread condition
+Fix ClassCastException in multi-thread condition.
+修复在多线程调用场景下的Exception。
 
 ## 2018.04.03
 

diff --git a/Sample/app/src/main/java/com/chenenyu/router/app/MainActivity.java b/Sample/app/src/main/java/com/chenenyu/router/app/MainActivity.java
@@ -27,19 +27,19 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        EditText editRoute = (EditText) findViewById(R.id.edit_route);
-        btn0 = (Button) findViewById(R.id.btn0);
-        btn1 = (Button) findViewById(R.id.btn1);
-        btn2 = (Button) findViewById(R.id.btn2);
-        btn3 = (Button) findViewById(R.id.btn3);
-        btn4 = (Button) findViewById(R.id.btn4);
-        btn5 = (Button) findViewById(R.id.btn5);
-        btn6 = (Button) findViewById(R.id.btn6);
-        btn7 = (Button) findViewById(R.id.btn7);
-        btn8 = (Button) findViewById(R.id.btn8);
-        btn9 = (Button) findViewById(R.id.btn9);
-        btn10 = (Button) findViewById(R.id.btn10);
-        btn11 = (Button) findViewById(R.id.btn11);
+        EditText editRoute = findViewById(R.id.edit_route);
+        btn0 = findViewById(R.id.btn0);
+        btn1 = findViewById(R.id.btn1);
+        btn2 = findViewById(R.id.btn2);
+        btn3 = findViewById(R.id.btn3);
+        btn4 = findViewById(R.id.btn4);
+        btn5 = findViewById(R.id.btn5);
+        btn6 = findViewById(R.id.btn6);
+        btn7 = findViewById(R.id.btn7);
+        btn8 = findViewById(R.id.btn8);
+        btn9 = findViewById(R.id.btn9);
+        btn10 = findViewById(R.id.btn10);
+        btn11 = findViewById(R.id.btn11);
 
         editRoute.addTextChangedListener(new TextWatcher() {
             @Override
@@ -115,7 +115,7 @@ public void callback(RouteResult state, Uri uri, String message) {
         } else if (v == btn9) {
             Router.build("intercepted").go(this);
         } else if (v == btn10) {
-            Router.build("intercepted").skipInterceptors("AInterceptor").go(this);
+            Router.build("intercepted").skipInterceptors().go(this);
         } else if (v == btn11) {
             Router.build("test").addInterceptors("AInterceptor").go(this);
         }

diff --git a/VERSION.properties b/VERSION.properties
@@ -1,5 +1,5 @@
 # router library version
-ROUTER_VERSION=1.4.2
+ROUTER_VERSION=1.4.3
 # compiler library version
 COMPILER_VERSION=1.4.0
 # annotation library version

diff --git a/annotation/build.gradle b/annotation/build.gradle
@@ -3,4 +3,15 @@ apply plugin: 'java'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
-apply from: 'publish.gradle'
+Properties config = new Properties()
+config.load(project.file('../VERSION.properties').newDataInputStream())
+def annoVersion = config.getProperty("ANNOTATION_VERSION")
+
+ext {
+    GROUP = 'com.chenenyu.router'  // required.
+    ARTIFACT = 'annotation' // required.
+    VERSION = annoVersion // required.
+    BINTRAY_NAME = 'annotation' // optional.
+}
+
+apply from: 'https://raw.githubusercontent.com/chenenyu/gradle-bintray-plugin/master/publish.gradle'
diff --git a/annotation/publish.gradle b/annotation/publish.gradle
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,6 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
 

diff --git a/compiler/build.gradle b/compiler/build.gradle
@@ -6,6 +6,7 @@ tasks.withType(JavaCompile) {
 
 Properties version = new Properties()
 version.load(project.file('../VERSION.properties').newDataInputStream())
+def compilerVersion = version.getProperty("COMPILER_VERSION")
 def annoVersion = version.getProperty("ANNOTATION_VERSION")
 
 dependencies {
@@ -18,4 +19,11 @@ dependencies {
 sourceCompatibility = rootProject.ext.sourceCompatibility
 targetCompatibility = rootProject.ext.targetCompatibility
 
-apply from: 'publish.gradle'
+ext {
+    GROUP = 'com.chenenyu.router'  // required.
+    ARTIFACT = 'compiler' // required.
+    VERSION = compilerVersion // required.
+    BINTRAY_NAME = 'compiler' // optional.
+}
+
+apply from: 'https://raw.githubusercontent.com/chenenyu/gradle-bintray-plugin/master/publish.gradle'
diff --git a/compiler/publish.gradle b/compiler/publish.gradle
diff --git a/release.sh b/release.sh
@@ -1,11 +1,11 @@
 # annotation
-./gradlew :annotation:clean :annotation:pBPTML
-./gradlew :annotation:bintrayUpload
+./gradlew clean pBPTML -p annotation
+./gradlew bintrayUpload -p annotation
 
 # compiler
-./gradlew :compiler:clean :compiler:pBPTML
-./gradlew :compiler:bintrayUpload
+./gradlew clean pBPTML -p compiler
+./gradlew bintrayUpload -p compiler
 
 # router
-./gradlew :router:clean :router:install
-./gradlew :router:bintrayUpload
+./gradlew clean pBPTML -p router
+./gradlew bintrayUpload -p router
diff --git a/router/build.gradle b/router/build.gradle
@@ -31,15 +31,22 @@ android {
 
 Properties version = new Properties()
 version.load(project.file('../VERSION.properties').newDataInputStream())
+def routerVersion = version.getProperty("ROUTER_VERSION")
 def annoVersion = version.getProperty("ANNOTATION_VERSION")
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
     compileOnly "com.android.support:support-v4:24.2.0"
 //    api project(':annotation')
-    // 这里不能使用implementation，因为pom依赖不识别
-    compile "com.chenenyu.router:annotation:${annoVersion}"
+    implementation "com.chenenyu.router:annotation:${annoVersion}"
 }
 
-apply from: 'publish.gradle'
+ext {
+    GROUP = 'com.chenenyu.router'  // required.
+    ARTIFACT = 'router' // required.
+    VERSION = routerVersion // required.
+    BINTRAY_NAME = 'router' // optional.
+}
+
+apply from: 'https://raw.githubusercontent.com/chenenyu/gradle-bintray-plugin/master/publish.gradle'
diff --git a/router/publish.gradle b/router/publish.gradle
diff --git a/router/src/main/java/com/chenenyu/router/RealRouter.java b/router/src/main/java/com/chenenyu/router/RealRouter.java
@@ -29,7 +29,19 @@
  * Created by chenenyu on 2017/3/30.
  */
 class RealRouter extends AbsRouter {
-    RealRouter() {
+
+    private static final ThreadLocal<RealRouter> mRouterThreadLocal = new ThreadLocal<RealRouter>() {
+        @Override
+        protected RealRouter initialValue() {
+            return new RealRouter();
+        }
+    };
+
+    private RealRouter() {
+    }
+
+    static RealRouter getInstance() {
+        return mRouterThreadLocal.get();
     }
 
     /**