Skip to content

Commit 723cb37

Browse files
Developerarif2Developerarif2
committed
see 03/09 log
1 parent 053e99e commit 723cb37

File tree

30 files changed

+261
-121
lines changed

30 files changed

+261
-121
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* `20/01/20` [upd] Publish v1.26.1.
2+
* `20/01/19` [add] Publish bus plugin v1.4.
3+
* `20/01/18` [add] Publish api plugin v2.6.
4+
* `20/01/17` [upd] Leak Canary to v2.1.
15
* `19/12/08` [add] Publish bus plugin v2.5.
26
* `19/12/06` [add] Publish api plugin v1.3.
37
* `19/11/30` [add] Publish bus plugin v2.4. Publish api plugin v1.2.

‎buildApp.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ android {
6767
dependencies {
6868
// LeakCanary
6969
debugImplementation Config.depConfig.leakcanary_android.dep
70-
debugImplementation Config.depConfig.leakcanary_support_fragment.dep
71-
releaseImplementation Config.depConfig.leakcanary_android_no_op.dep
7270

7371
debugImplementation Config.depConfig.lib_utildebug.dep
7472
releaseImplementation Config.depConfig.lib_utildebug_no_op.dep
@@ -84,8 +82,8 @@ dependencies {
8482
}
8583

8684
def getSuffix() {
87-
if (project.path == ":feature:launcher:app") return ""
88-
return project.path.replace(":", "_").substring(":feature".length(), project.path.length() - ":app".length())
85+
if (project.path == ":feature_launcher_app") return ""
86+
return "." + project.path.substring(":feature_".length(), project.path.length() - "_app".length())
8987
}
9088

9189
def configSigning() {

‎buildLib.gradle‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,19 @@ android {
2424
lintOptions {
2525
abortOnError false
2626
}
27-
}
2827

29-
afterEvaluate {
30-
generateReleaseBuildConfig.enabled = false
31-
generateDebugBuildConfig.enabled = false
28+
// viewBinding {
29+
// enabled = true
30+
// }
3231
}
3332

3433
dependencies {
35-
if (project.name == 'pkg' || project.name == 'mock') {
34+
if (project.name.endsWith("_pkg") || project.name.endsWith("_mock")) {
3635
// if module's name equals 'pkg', api all of export
3736
for (def entrySet : ConfigUtils.getApplyExports().entrySet()) {
3837
api entrySet.value.dep
3938
}
40-
} else if (project.name == 'export') {
39+
} else if (project.name.endsWith("_export")) {
4140
api Config.depConfig.lib_common.dep
4241
}
4342
}

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ class Config {
1111
static applicationId = 'com.blankj.androidutilcode'
1212
static appName = 'Util'
1313

14-
static compileSdkVersion = 28
14+
static compileSdkVersion = 29
1515
static minSdkVersion = 14
16-
static targetSdkVersion = 28
16+
static targetSdkVersion = 29
1717
static versionCode = 1_026_001
18-
static versionName = '1.26.1-alpha0'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.26.1-alpha3'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
21-
static gradlePluginVersion = '3.5.2'
21+
static gradlePluginVersion = '3.5.0'
2222
static kotlinVersion = '1.3.50'
2323
static supportVersion = '28.0.0'
24-
static leakcanaryVersion = '1.6.3'
2524

2625
static depConfig = [
2726
/*Never delete this line*/
@@ -54,10 +53,10 @@ class Config {
5453
// 本地第一次上传插件新的版本需设置 isApply = false, useLocal = true
5554
// 本地上传成功之后 isApply = true 即可应用插件来调试，后续版本更新无需设置 isApply = false
5655
// 发布版本的话把 isApply = false, useLocal = false，更新版本号，发布成功后 isApply = true 即可使用远程库版本
57-
plugin_api : new DepConfig(isApply: false, useLocal: true, pluginPath: "com.blankj:api-gradle-plugin:1.3-r4", pluginId: "com.blankj.api"),
56+
plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.4-r1", pluginId: "com.blankj.api"),
5857
//./gradlew plugin:api-gradle-plugin:uploadArchives // 上传到本地 maven
5958
//./gradlew plugin:api-gradle-plugin:bintrayUpload // 上传到 jcenter
60-
plugin_bus : new DepConfig(isApply: true, useLocal: true, pluginPath: "com.blankj:bus-gradle-plugin:2.5", pluginId: "com.blankj.bus"),
59+
plugin_bus : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.6-r2", pluginId: "com.blankj.bus"),
6160
//./gradlew plugin:bus-gradle-plugin:uploadArchives // 上传到本地 maven
6261
//./gradlew plugin:bus-gradle-plugin:bintrayUpload // 上传到 jcenter
6362

@@ -68,9 +67,7 @@ class Config {
6867

6968
kotlin : new DepConfig("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"),
7069

71-
leakcanary_android : new DepConfig("com.squareup.leakcanary:leakcanary-android:$leakcanaryVersion"),
72-
leakcanary_android_no_op : new DepConfig("com.squareup.leakcanary:leakcanary-android-no-op:$leakcanaryVersion"),
73-
leakcanary_support_fragment: new DepConfig("com.squareup.leakcanary:leakcanary-support-fragment:$leakcanaryVersion"),
70+
leakcanary_android : new DepConfig("com.squareup.leakcanary:leakcanary-android:2.1"),
7471

7572
free_proguard : new DepConfig("com.blankj:free-proguard:1.0.2"),
7673
swipe_panel : new DepConfig("com.blankj:swipe-panel:1.2"),
@@ -86,7 +83,7 @@ class Config {
8683
photo_view : new DepConfig("com.github.chrisbanes:PhotoView:2.0.0"),
8784

8885
test_junit : new DepConfig("junit:junit:4.12"),
89-
test_robolectric : new DepConfig("org.robolectric:robolectric:4.2"),
86+
test_robolectric : new DepConfig("org.robolectric:robolectric:4.3.1"),
9087
]
9188
}
9289
//./gradlew clean :lib:utilcode:bintrayUpload

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import org.gradle.api.invocation.Gradle
1414
class ConfigUtils {
1515

1616
static init(Gradle gradle) {
17-
GitUtils.init(gradle)
1817
generateDep(gradle)
1918
addCommonGradle(gradle)
2019
TaskDurationUtils.init(gradle)
20+
GitUtils.init(gradle)
2121
}
2222

2323
/**
@@ -47,10 +47,10 @@ class ConfigUtils {
4747
void beforeEvaluate(Project project) {
4848
// 在 project 的 build.gradle 前 do sth.
4949
if (project.subprojects.isEmpty()) {
50-
if (project.path.contains(":plugin:")) {
50+
if (project.name.startsWith("plugin")) {
5151
return
5252
}
53-
if (project.name == "app") {
53+
if (project.name.endsWith("_app")) {
5454
GLog.l(project.toString() + " applies buildApp.gradle")
5555
project.apply {
5656
from "${project.rootDir.path}/buildApp.gradle"

‎buildSrc/src/main/groovy/DepConfig.groovy‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ class DepConfig {
7575
return splits.length == 3 ? splits[2] : null
7676
}
7777

78+
String getLocalPath() {
79+
return ":" + localPath.replace(":", "_").substring(1)
80+
}
81+
7882
@Override
7983
String toString() {
8084
return "{ isApply = ${getFlag(isApply)}" +

‎buildSrc/src/main/groovy/GitUtils.groovy‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ class GitUtils {
1919
static void init(Gradle gradle) {
2020
rootProject = gradle.rootProject
2121
addGitHelpTask()
22-
// gradle.rootProject(new Action<Project>() {
23-
// @Override
24-
// void execute(Project project) {
25-
// addGitHelpTask()
26-
// }
27-
// })
2822
}
2923

3024
static def addGitHelpTask() {

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ object DialogHelper {
8888
contentView.findViewById<View>(R.id.keyboardDialogCloseBtn).setOnClickListener(listener)
8989

9090
dialog.dialog.setOnShowListener(DialogInterface.OnShowListener {
91-
KeyboardUtils.fixAndroidBug5497(dialog.dialog.window)
91+
KeyboardUtils.fixAndroidBug5497(dialog.dialog.window!!)
9292
})
9393
}
9494

‎lib/base/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ dependencies {
1212
api Config.depConfig.swipe_panel.dep
1313
api Config.depConfig.eventbus_lib.dep
1414
compileOnly Config.depConfig.lib_utildebug_no_op.dep
15-
compileOnly Config.depConfig.leakcanary_android_no_op.dep
1615
}

‎lib/base/src/main/java/com/blankj/base/BaseApplication.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.blankj.utilcode.util.CrashUtils;
99
import com.blankj.utilcode.util.LogUtils;
1010
import com.blankj.utilcode.util.ProcessUtils;
11-
import com.squareup.leakcanary.LeakCanary;
1211

1312
import java.util.ArrayList;
1413

@@ -43,22 +42,10 @@ protected void attachBaseContext(Context base) {
4342
public void onCreate() {
4443
super.onCreate();
4544
sInstance = this;
46-
initLeakCanary();
4745
initLog();
4846
initCrash();
4947
}
5048

51-
private void initLeakCanary() {// 内存泄露检查工具
52-
if (isDebug()) {
53-
if (LeakCanary.isInAnalyzerProcess(this)) {
54-
// This process is dedicated to LeakCanary for heap analysis.
55-
// You should not init your app in this process.
56-
return;
57-
}
58-
LeakCanary.install(this);
59-
}
60-
}
61-
6249
// init it in ur application
6350
public void initLog() {
6451
LogUtils.Config config = LogUtils.getConfig()

0 commit comments

Comments
 (0)