Skip to content

Commit 342b4e2

Browse files
author
肖琪(融汇/产品技术中心)
committed
support gradle tools 4.+
1 parent 0e889cb commit 342b4e2

File tree

15 files changed

+204
-65
lines changed

15 files changed

+204
-65
lines changed

.idea/codeStyles/Project.xml

Lines changed: 134 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 7 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ project的gradle:
6262
...
6363
aspectjx{
6464
include "com.noober.savehelper"
65+
exclude 'versions.9'
6566
}
67+
6668
}
6769
## 混淆配置:
6870

build.gradle

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,34 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.30'
4+
ext.kotlin_version = '1.4.10'
55

66
repositories {
7-
jcenter()
8-
maven {
9-
url 'https://maven.google.com/'
10-
name 'Google'
11-
}
127
maven {
138
url uri('publish')
149
}
10+
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
11+
maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
1512
google()
1613
}
1714
dependencies {
18-
classpath 'com.android.tools.build:gradle:3.1.2'
15+
classpath 'com.android.tools.build:gradle:4.2.1'
1916
classpath 'com.novoda:bintray-release:0.8.1'
2017
// NOTE: Do not place your application dependencies here; they belong
2118
// in the individual module build.gradle files
2219
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
23-
classpath 'com.noober.plugin:savehelper-plugin:3.0.7'
24-
// classpath 'com.noober.save:plugin:3.0.7'
25-
classpath 'org.aspectj:aspectjtools:1.8.13'
26-
classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.2'
20+
// classpath 'com.noober.plugin:savehelper-plugin:3.0.7'
21+
classpath 'com.noober.save:plugin:3.0.7'
22+
classpath 'org.aspectj:aspectjtools:1.9.4'
23+
classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.10'
2724
}
2825
}
2926

3027
allprojects {
3128
repositories {
32-
jcenter()
33-
maven {
34-
url 'https://maven.google.com/'
35-
name 'Google'
36-
}
29+
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
30+
maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
31+
google()
3732
}
3833
tasks.withType(Javadoc) {
3934
options.addStringOption('Xdoclint:none', '-quiet')
@@ -50,7 +45,7 @@ ext {
5045
userOrg = 'noober'
5146
groupId = 'com.noober'
5247
uploadName = 'AutoSaver'
53-
publishVersion = '3.0.7'
48+
publishVersion = '4.0.0'
5449
desc = "A light weight framework can automatically generate 'OnSaveInstanceState' code"
5550
website = 'https://github.com/JavaNoober/AutoSave'
5651
// gradlew clean build bintrayUpload -PbintrayUser=xiaoqiandroid -PbintrayKey=xxxxxxxxxxxxxxxx -PdryRun=false

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#org.gradle.jvmargs= -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005;
1414
org.gradle.jvmargs=-Xmx4096m
1515
org.gradle.parallel=true
16+
kapt.use.worker.api=false
1617
# When configured, Gradle will run in incubating parallel mode.
1718
# This option should only be used with decoupled projects. More details, visit
1819
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Aug 15 11:27:21 CST 2018
1+
#Tue Jun 01 16:52:39 CST 2021
22
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

sample/build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-kapt'
3-
apply plugin: 'kotlin-android-extensions'
2+
43
apply plugin: 'kotlin-android'
5-
apply plugin: 'AutoSave'
4+
apply plugin: 'kotlin-android-extensions'
5+
apply plugin: 'kotlin-kapt'
6+
//apply plugin: 'AutoSave'
67
apply plugin: 'android-aspectjx'
78

89
android {
@@ -25,6 +26,10 @@ android {
2526
}
2627
}
2728

29+
aspectjx {
30+
include "com.noober.savehelper"
31+
exclude 'versions.9'
32+
}
2833
}
2934

3035

@@ -36,10 +41,10 @@ dependencies {
3641
})
3742
implementation 'com.android.support:appcompat-v7:26.0.1'
3843
testImplementation 'junit:junit:4.12'
39-
implementation 'org.aspectj:aspectjrt:1.8.13'
44+
implementation 'org.aspectj:aspectjrt:1.9.4'
4045
implementation project(':savehelper')
4146
implementation project(':savehelper-api')
4247
kapt project(':savehelper-processor')
43-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
48+
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
4449
}
4550

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public class SampleActivity extends AppCompatActivity {
7070
Bundle bundle;
7171

7272

73-
@NeedSave
74-
private SecondSExample secondSExample;
73+
// @NeedSave
74+
// private SecondSExample secondSExample;
7575

7676
// @NeedSave
7777
// SecondSExample2 secondSExample2;

savehelper-plugin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
//groovy sdk
99
implementation 'com.android.tools.build:gradle:3.1.2'
1010
// implementation 'org.javassist:javassist:3.20.0-GA'
11-
implementation 'org.aspectj:aspectjtools:1.8.13'
11+
implementation 'org.aspectj:aspectjtools:1.9.4'
1212
}
1313

1414
repositories {

0 commit comments

Comments
 (0)