Skip to content

Commit e2b87c7

Browse files
author
Blankj
committed
see 08/15 log
2 parents 737e3b8 + 40c0e36 commit e2b87c7

36 files changed

Lines changed: 4708 additions & 18935 deletions

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* `19/08/13` [add] MapUtils and MapUtilsTest. Publish v1.25.8.
2+
* `19/08/12` [add] CollectionUtils and CollectionUtilsTest.
3+
* `19/08/11` [add] ArrayUtils and ArrayUtilsTest.
14
* `19/08/09` [fix] https://www.virustotal.com/gui/home/upload with ESET-NOD32. Publish v1.25.7.
25
* `19/08/08` [add] BusUtils#post tag support one-to-many. Publish v1.25.6.
36
* `19/08/04` [add] ThreadUtils#Task support timeout.

‎README-CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame_cn.png
5353

54-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.7-brightgreen.svg
54+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.8-brightgreen.svg
5555
[auc]: https://github.com/Blankj/AndroidUtilCode
5656

5757
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If this project helps you a lot and you want to support the project's developmen
5151

5252
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
5353

54-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.7-brightgreen.svg
54+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.8-brightgreen.svg
5555
[auc]: https://github.com/Blankj/AndroidUtilCode
5656

5757
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎art/auc_frame.png‎

2.17 KB
Loading

‎buildApp.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,22 @@ android {
2222
applicationId Config.applicationId + suffix
2323
targetSdkVersion Config.targetSdkVersion
2424
multiDexEnabled true
25-
resValue "string", "app_name", Config.appName + suffix
2625
}
2726

2827
buildTypes {
2928
debug {
3029
minifyEnabled false
3130
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3231
applicationIdSuffix ".debug"
32+
resValue "string", "app_name", Config.appName + suffix + ".debug"
3333
}
34+
3435
release {
3536
aaptOptions.cruncherEnabled = false
3637
aaptOptions.useNewCruncher = false
3738
minifyEnabled true
3839
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
40+
resValue "string", "app_name", Config.appName + suffix
3941
}
4042
}
4143

@@ -66,9 +68,7 @@ dependencies {
6668
api entrySet.value.dep
6769
}
6870

69-
// 如果 Config.pkgConfig 不为空，说明可能导入了部分 pkg，
70-
// 那么可能有些 api 没有实现，需要导入 mock 层的 api
71-
if (!Config.pkgConfig.isEmpty()) {
71+
if (Config.depConfig.feature.mock.isApply) {
7272
api Config.depConfig.feature.mock.dep
7373
}
7474
}

‎buildSrc/src/main/groovy/Config.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class Config {
1515
static minSdkVersion = 14
1616

1717
static targetSdkVersion = 28
18-
static versionCode = 1_025_007
19-
static versionName = '1.25.7'// E.g. 1.9.72 => 1,009,072
18+
static versionCode = 1_025_008
19+
static versionName = '1.25.8'// E.g. 1.9.72 => 1,009,072
2020

2121
// lib version
2222
static kotlin_version = '1.3.10'

‎buildSrc/src/main/groovy/ConfigUtils.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import org.apache.commons.io.FileUtils
2+
import org.apache.groovy.json.internal.ArrayUtils
23
import org.gradle.BuildListener
34
import org.gradle.BuildResult
45
import org.gradle.api.Project
@@ -9,6 +10,7 @@ import org.gradle.api.execution.TaskExecutionListener
910
import org.gradle.api.initialization.Settings
1011
import org.gradle.api.invocation.Gradle
1112
import org.gradle.api.tasks.TaskState
13+
import org.gradle.internal.impldep.org.apache.commons.collections.MapUtils
1214

1315
import java.text.SimpleDateFormat
1416

‎buildSrc/src/main/groovy/GLog.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.gradle.internal.impldep.org.apache.http.util.EntityUtils
2+
13
/**
24
* <pre>
35
* author: blankj

‎feature/launcher/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<activity
1313
android:name="com.blankj.main.pkg.MainActivity"
1414
android:configChanges="orientation|keyboardHidden|screenSize"
15+
android:launchMode="singleTask"
1516
android:screenOrientation="user"
1617
android:windowSoftInputMode="stateHidden">
1718
<intent-filter>

‎feature/main/pkg/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.blankj.main.pkg">
2+
package="com.blankj.main.pkg">
33

44
<application>
55
<activity
66
android:name=".MainActivity"
77
android:configChanges="orientation|keyboardHidden|screenSize"
8+
android:launchMode="singleTask"
89
android:screenOrientation="user"
910
android:windowSoftInputMode="stateHidden" />
1011
</application>

0 commit comments

Comments
 (0)