Merge pull request #167 from chenenyu/dev

1.8.0

Author: chenenyu

Sample/app/build.gradle

@@ -11,15 +11,15 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
+//    viewBinding.enabled = true
     buildFeatures {
         viewBinding true
     }
 
     buildTypes {
         debug {
             // 测试混淆
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -28,12 +28,16 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "androidx.appcompat:appcompat:1.3.0"
     implementation project(':module1')
     implementation project(':module2')
-    testImplementation 'junit:junit:4.12'
 }

Sample/app/proguard-rules.pro

@@ -25,5 +25,8 @@
 #-renamesourcefileattribute SourceFile
 
 # Router
--keep class * implements com.chenenyu.router.template.ParamInjector
+#-keep class * implements com.chenenyu.router.template.InterceptorTable
+#-keep class * implements com.chenenyu.router.template.ParamInjector
+#-keep class * implements com.chenenyu.router.template.RouteTable
+#-keep class * implements com.chenenyu.router.template.TargetInterceptorsTable
 

Sample/app/src/test/java/com/chenenyu/router/app/ExampleUnitTest.java

@@ -11,13 +11,13 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
+//    viewBinding.enabled = true
     buildFeatures {
         viewBinding true
     }
 
     buildTypes {
-        release {
+        debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -31,6 +31,11 @@ android {
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

Sample/module1/build.gradle

@@ -47,7 +47,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             requireActivity().finish();
         });
 
-        Router.injectParams(Module1Fragment.this);
+        Router.injectParams(this);
 
         Log.d(Module1Fragment.class.getSimpleName(), "test1=" + test1);
     }

Sample/module1/src/main/java/com/chenenyu/router/module/Module1Fragment.java

@@ -11,13 +11,13 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
+//    viewBinding.enabled = true
     buildFeatures {
         viewBinding true
     }
 
     buildTypes {
-        release {
+        debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -31,6 +31,11 @@ android {
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

Sample/module2/build.gradle

@@ -13,8 +13,5 @@
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.CLASS)
 public @interface InjectParam {
-    /**
-     * Map param field with the specify key in extras.
-     */
     String key() default "";
 }

annotation/src/main/java/com/chenenyu/router/annotation/InjectParam.java

@@ -13,8 +13,5 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.CLASS)
 public @interface Interceptor {
-    /**
-     * Interceptor name.
-     */
     String value();
 }

annotation/src/main/java/com/chenenyu/router/annotation/Interceptor.java

@@ -13,13 +13,7 @@
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.CLASS)
 public @interface Route {
-    /**
-     * Route path.
-     */
     String[] value();
 
-    /**
-     * The interceptors' name.
-     */
     String[] interceptors() default {};
 }

annotation/src/main/java/com/chenenyu/router/annotation/Route.java

@@ -1,12 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.5.31'
     repositories {
-//        maven { url 'repo' }
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         if (Boolean.valueOf(applyRemotePlugin)) {
             classpath "com.chenenyu.router:gradle-plugin:${PLUGIN_VERSION}"
@@ -26,9 +25,9 @@ task clean(type: Delete) {
 }
 
 ext {
-    compileSdkVersion = 29
+    compileSdkVersion = 30
     minSdkVersion = 16
-    targetSdkVersion = 29
+    targetSdkVersion = 30
 //    compilerLoggable = false
 //    androidxVersion = "1.1.0"
 }