Skip to content

Commit c8d98f8

Browse files
committed
see 07/13 log
1 parent ff046c3 commit c8d98f8

File tree

325 files changed

+2409
-918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+2409
-918
lines changed

ApiUtils2333.class

3.46 KB
Binary file not shown.

BusUtils2333.class

9 KB
Binary file not shown.

app/launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

app/launcher/pkg/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/mock/build.gradle

Lines changed: 0 additions & 11 deletions
This file was deleted.

app/utilcode/export/build.gradle

Lines changed: 0 additions & 7 deletions
This file was deleted.

app/utilcode/pkg/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/utilcode/pkg/proguard-rules.pro

Lines changed: 0 additions & 21 deletions
This file was deleted.

app/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusActivity.kt

Lines changed: 0 additions & 72 deletions
This file was deleted.

app/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusRemoteActivity.kt

Lines changed: 0 additions & 69 deletions
This file was deleted.

app/utilcode/pkg/src/main/res/layout/activity_bus_remote.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

art/frame.png

56.2 KB
Loading

build.gradle

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,32 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
repositories {
4+
maven() {
5+
// use for debug plugin local
6+
if (Config.depConfig.plugin.bus.useLocal || Config.depConfig.plugin.api.useLocal) {
7+
url new File("maven")
8+
}
9+
}
410
maven {
511
url 'https://maven.aliyun.com/repository/public'
6-
name '代替 jcenter()及mavenCentral()'
12+
name 'replace jcenter() and mavenCentral()'
713
}
814
maven {
915
url 'https://maven.aliyun.com/repository/jcenter'
10-
name '代替 jcenter()'
16+
name 'replace jcenter()'
1117
}
1218
maven {
1319
url 'https://maven.aliyun.com/repository/google'
14-
name '代替 google()'
15-
}
16-
17-
maven() {
18-
// use for debug plugin local
19-
if (Config.depConfig.plugin_bus.useLocal) {
20-
url new File("maven/bus")
21-
}
22-
if (Config.depConfig.plugin_api.useLocal) {
23-
url new File("maven/api")
24-
}
20+
name 'replace google()'
2521
}
2622
google()
2723
jcenter()
2824
}
2925

3026
dependencies {
3127
// 根据 config 来 configClasspath 各 plugin
32-
Config.depConfig.each { name, config ->
33-
if (name.startsWith("plugin_") && config.isApply) {
28+
Config.depConfig.plugin.each { name, config ->
29+
if (config.isApply) {
3430
classpath config.remotePath
3531
}
3632
}
@@ -41,15 +37,15 @@ allprojects {
4137
repositories {
4238
maven {
4339
url 'https://maven.aliyun.com/repository/public'
44-
name '代替 jcenter()及mavenCentral()'
40+
name 'replace jcenter() and mavenCentral()'
4541
}
4642
maven {
4743
url 'https://maven.aliyun.com/repository/jcenter'
48-
name '代替 jcenter()'
44+
name 'replace jcenter()'
4945
}
5046
maven {
5147
url 'https://maven.aliyun.com/repository/google'
52-
name '代替 google()'
48+
name 'replace google()'
5349
}
5450
google()
5551
jcenter()

buildApp.gradle

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apply {
22
plugin "com.android.application"
33
plugin "kotlin-android"
44
plugin "kotlin-android-extensions"
5-
if (Config.depConfig.plugin_bus.isApply) {
5+
if (Config.depConfig.plugin.bus.isApply) {
66
plugin "com.blankj.bus"
77
}
8-
if (Config.depConfig.plugin_api.isApply) {
8+
if (Config.depConfig.plugin.api.isApply) {
99
plugin "com.blankj.api"
1010
}
1111
}
@@ -55,12 +55,19 @@ android {
5555

5656
dependencies {
5757
// LeakCanary
58-
debugImplementation Config.depConfig.leakcanary_android.dep
59-
debugImplementation Config.depConfig.leakcanary_support_fragment.dep
60-
releaseImplementation Config.depConfig.leakcanary_android_no_op.dep
58+
debugImplementation Config.depConfig.leakcanary.android.dep
59+
debugImplementation Config.depConfig.leakcanary.support_fragment.dep
60+
releaseImplementation Config.depConfig.leakcanary.android_no_op.dep
6161

62-
if (!project.toString().contains('launcher')) { // equals app:launcher:pkg
63-
api Config.depConfig.mock.dep
62+
// 根据 Config.pkgConfig 来依赖所有 pkg
63+
for (def entrySet : ConfigUtils.getApplyPkgs().entrySet()) {
64+
api entrySet.value.dep
65+
}
66+
67+
// 如果 Config.pkgConfig 不为空,说明可能导入了部分 pkg,
68+
// 那么可能有些 api 没有实现,需要导入 mock 层的 api
69+
if (!Config.pkgConfig.isEmpty()) {
70+
api Config.depConfig.feature.mock.dep
6471
}
6572
}
6673

buildLib.gradle

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,12 @@ afterEvaluate {
3131
}
3232

3333
dependencies {
34-
if (project.name == 'pkg') { // if module's name equals 'pkg'
35-
if (project.toString().contains('launcher')) { // equals app:launcher:pkg
36-
for (config in Config.depConfig) {// api all pkg except self
37-
if (config.key.endsWith("_pkg") && config.key != "launcher_pkg") {
38-
api config.value.dep
39-
}
40-
}
41-
} else {// other pkg ap all exports
42-
for (config in Config.depConfig) {
43-
if (config.key.endsWith("_export")) {
44-
api config.value.dep
45-
}
46-
}
34+
if (project.name == 'pkg' || project.name == 'mock') {
35+
// if module's name equals 'pkg', api all of export
36+
for (def entrySet : ConfigUtils.getApplyExports().entrySet()) {
37+
api entrySet.value.dep
4738
}
39+
} else if (project.name == 'export') {
40+
api Config.depConfig.lib.common.dep
4841
}
4942
}

buildSrc/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ gradlePlugin {
1818
}
1919

2020
dependencies {
21-
compile gradleApi()
22-
compile localGroovy()
21+
implementation gradleApi()
22+
implementation localGroovy()
2323
}
2424

2525
sourceSets {

0 commit comments

Comments
 (0)