support gradle tools 4.+

README.md

@@ -62,7 +62,9 @@ project的gradle:
         ...
         aspectjx{
             include "com.noober.savehelper"
+            exclude 'versions.9'
         }
+
     }
 ## 混淆配置：
 

build.gradle

@@ -1,39 +1,34 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.4.10'
 
     repositories {
-        jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
         maven {
             url uri('publish')
         }
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'com.novoda:bintray-release:0.8.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.noober.plugin:savehelper-plugin:3.0.7'
-//        classpath 'com.noober.save:plugin:3.0.7'
-        classpath 'org.aspectj:aspectjtools:1.8.13'
-        classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.2'
+//        classpath 'com.noober.plugin:savehelper-plugin:3.0.7'
+        classpath 'com.noober.save:plugin:3.0.7'
+        classpath 'org.aspectj:aspectjtools:1.9.4'
+        classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.10'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
+        google()
     }
     tasks.withType(Javadoc) {
         options.addStringOption('Xdoclint:none', '-quiet')
@@ -50,7 +45,7 @@ ext {
     userOrg = 'noober'
     groupId = 'com.noober'
     uploadName = 'AutoSaver'
-    publishVersion = '3.0.7'
+    publishVersion = '4.0.0'
     desc = "A light weight framework can automatically generate 'OnSaveInstanceState' code"
     website = 'https://github.com/JavaNoober/AutoSave'
 //    gradlew clean build bintrayUpload -PbintrayUser=xiaoqiandroid -PbintrayKey=xxxxxxxxxxxxxxxx -PdryRun=false

gradle.properties

@@ -13,6 +13,7 @@
 #org.gradle.jvmargs= -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005;
 org.gradle.jvmargs=-Xmx4096m
 org.gradle.parallel=true
+kapt.use.worker.api=false
 # 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,6 +1,6 @@
-#Wed Aug 15 11:27:21 CST 2018
+#Tue Jun 01 16:52:39 CST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+zipStoreBase=GRADLE_USER_HOME

sample/build.gradle

@@ -1,8 +1,9 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
+
 apply plugin: 'kotlin-android'
-apply plugin: 'AutoSave'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+//apply plugin: 'AutoSave'
 apply plugin: 'android-aspectjx'
 
 android {
@@ -25,6 +26,10 @@ android {
         }
     }
 
+    aspectjx {
+        include "com.noober.savehelper"
+        exclude 'versions.9'
+    }
 }
 
 
@@ -36,10 +41,10 @@ dependencies {
     })
     implementation 'com.android.support:appcompat-v7:26.0.1'
     testImplementation 'junit:junit:4.12'
-    implementation 'org.aspectj:aspectjrt:1.8.13'
+    implementation 'org.aspectj:aspectjrt:1.9.4'
     implementation project(':savehelper')
     implementation project(':savehelper-api')
     kapt project(':savehelper-processor')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 }
 

sample/src/main/java/com/recover/autosavesample/SampleActivity.java

@@ -70,8 +70,8 @@ public class SampleActivity extends AppCompatActivity {
     Bundle bundle;
 
 
-	@NeedSave
-	private SecondSExample secondSExample;
+//	@NeedSave
+//	private SecondSExample secondSExample;
 
 //	@NeedSave
 //	SecondSExample2 secondSExample2;

savehelper-plugin/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     //groovy sdk
     implementation 'com.android.tools.build:gradle:3.1.2'
 //    implementation 'org.javassist:javassist:3.20.0-GA'
-    implementation 'org.aspectj:aspectjtools:1.8.13'
+    implementation 'org.aspectj:aspectjtools:1.9.4'
 }
 
 repositories {