README.md

@@ -4,8 +4,6 @@
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/drakeet/Floo/blob/master/LICENSE)
 ![maven-central](https://img.shields.io/maven-central/v/me.drakeet.floo/floo.svg)
 
-English Version | [中文版](README_CN.md)
-
 An URL router supporting AOP, stack control, cross-page message, and dynamic routing.
 
 <a href='https://play.google.com/store/apps/details?id=me.drakeet.floo.sample&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get sample on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' width=200 height=77/></a>
@@ -16,15 +14,15 @@ In your `build.gradle`:
 
 ```groovy
 dependencies {
-    compile 'me.drakeet.floo:floo:1.1.0'
+  implementation 'me.drakeet.floo:floo:1.2.0'
 }
 ```
 
-If you are using `com.android.tools.build:gradle:3.+`, use this instead:
+Floo has been rebuilt based on AndroidX. If you are still using the android support library, please use:
 
 ```groovy
 dependencies {
-    implementation 'me.drakeet.floo:floo:1.1.0'
+  implementation 'me.drakeet.floo:floo:1.1.0'
 }
 ```
 
@@ -170,6 +168,12 @@ public interface StackStates {
 }
 ```
 
+## Progurad
+
+```
+-keep class com.drakeet.floo.Target { *; }
+```
+
 ## Some built-in extensions
 
 - `LogInterceptor`

build.gradle

@@ -15,20 +15,22 @@
  */
 
 buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-    }
+  repositories {
+    google()
+    jcenter()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:3.4.0'
+  }
 }
 
 allprojects {
-    repositories {
-        jcenter()
-    }
+  repositories {
+    google()
+    jcenter()
+  }
 }
 
 task clean(type: Delete) {
-    delete rootProject.buildDir
+  delete rootProject.buildDir
 }

gradle.properties

@@ -13,20 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

@@ -1,21 +1,6 @@
-#
-# Copyright 2017 drakeet. https://github.com/drakeet
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
+#Sun Apr 28 13:51:19 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

library/build.gradle

@@ -16,30 +16,26 @@
 
 apply plugin: 'com.android.library'
 apply from: 'gradle-mvn-push.gradle'
-apply from: 'checkstyle.gradle'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.1'
+  compileSdkVersion 28
 
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 25
-        versionCode 7
-        versionName "1.0.5"
-    }
+  defaultConfig {
+    minSdkVersion 14
+    targetSdkVersion 28
+    versionCode 12
+    versionName "1.2.0"
+  }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            consumerProguardFile 'proguard-rules.pro'
-        }
+  buildTypes {
+    release {
+      minifyEnabled false
+      consumerProguardFile 'proguard-rules.pro'
     }
+  }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-
-    compile 'com.android.support:support-annotations:25.3.1'
+  testImplementation 'junit:junit:4.12'
+  implementation 'androidx.annotation:annotation:1.0.2'
 }