Skip to content

Commit 5a1abb5

Browse files
committed
see 04/26 log
1 parent db2c5b9 commit 5a1abb5

File tree

7 files changed

+31
-22
lines changed

7 files changed

+31
-22
lines changed

app/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ android {
3636
}
3737

3838
sourceSets {
39-
main {
40-
res.srcDirs('src/main/res', 'src/main/res_core', 'src/main/res_sub')
41-
}
39+
main.res.srcDirs += 'src/main/res_core'
40+
main.res.srcDirs += 'src/main/res_sub'
4241
}
4342

4443
lintOptions {

app/proguard-rules.pro

+1-13
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,4 @@
1414
# class:
1515
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
1616
# public *;
17-
#}
18-
-keep class com.blankj.utilcode.** { *; }
19-
-keepclassmembers class com.blankj.utilcode.** { *; }
20-
-dontwarn com.blankj.utilcode.**
21-
22-
# Gson
23-
-keepattributes Signature
24-
-keepattributes *Annotation*
25-
-keep class sun.misc.Unsafe { *; }
26-
-keep class com.google.gson.stream.** { *; }
27-
# 使用Gson时需要配置Gson的解析对象及变量都不混淆。不然Gson会找不到变量。
28-
# 将下面替换成自己的实体类
29-
#-keep class com.example.bean.** { *; }
17+
#}

app/src/main/java/com/blankj/androidutilcode/feature/core/CoreUtilActivity.java

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.blankj.androidutilcode.feature.core.activity.ActivityActivity;
1212
import com.blankj.androidutilcode.feature.core.app.AppActivity;
1313
import com.blankj.androidutilcode.feature.core.bar.BarActivity;
14+
import com.blankj.androidutilcode.feature.core.clean.CleanActivity;
1415
import com.blankj.androidutilcode.feature.core.device.DeviceActivity;
1516
import com.blankj.androidutilcode.feature.core.fragment.FragmentActivity;
1617
import com.blankj.androidutilcode.feature.core.image.ImageActivity;
@@ -84,6 +85,10 @@ public void barClick(View view) {
8485
BarActivity.start(this);
8586
}
8687

88+
public void cleanClick(View view) {
89+
CleanActivity.start(this);
90+
}
91+
8792
public void crashClick(View view) {
8893
throw new NullPointerException("crash test");
8994
}

build.gradle

+13-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.1.0'
8+
classpath 'com.android.tools.build:gradle:3.1.2'
99
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1010
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
1111

@@ -21,6 +21,17 @@ allprojects {
2121
google()
2222
jcenter()
2323
}
24+
25+
configurations.all {
26+
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
27+
28+
resolutionStrategy.eachDependency {
29+
if (it.requested.group == 'com.android.support'
30+
&& it.requested.name != 'multidex') {
31+
it.useVersion support_version
32+
}
33+
}
34+
}
2435
}
2536

2637
task clean(type: Delete) {
@@ -44,6 +55,4 @@ ext {
4455

4556
junit_version = '4.12'
4657
robolectric_version = '3.1.2'
47-
}
48-
49-
58+
}

update_log.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 18/04/25 修复多个空异常,发布 1.14.1 版本
12
* 18/04/24 修复多 FileProvider 带来的问题,发布 1.14.0 版本
23
* 18/04/23 新增 RSA 加解密,发布 1.13.16 版本
34
* 18/04/22 新增 LogUtils 设置栈偏移

utilcode/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111

1212
buildTypes {
1313
release {
14-
minifyEnabled false
14+
minifyEnabled true
1515
consumerProguardFiles 'proguard-rules.pro'
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717
}

utilcode/proguard-rules.pro

+8-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,11 @@
1818

1919
-keep class com.blankj.utilcode.** { *; }
2020
-keepclassmembers class com.blankj.utilcode.** { *; }
21-
-dontwarn com.blankj.utilcode.**
21+
-dontwarn com.blankj.utilcode.**
22+
23+
# @Keep
24+
-keep,allowobfuscation @interface android.support.annotation.Keep
25+
-keep @android.support.annotation.Keep class *
26+
-keepclassmembers class * {
27+
@android.support.annotation.Keep *;
28+
}

0 commit comments

Comments
 (0)