Skip to content

Commit 2511945

Browse files
committed
see 07/14 log
1 parent c8d98f8 commit 2511945

Some content is hidden

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

45 files changed

+319
-293
lines changed

ApiUtils2333.class

-3.46 KB
Binary file not shown.

BusUtils2333.class

-9 KB
Binary file not shown.

build.gradle

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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) {
4+
// use for debug plugin local
5+
if (Config.depConfig.plugin.bus.useLocal || Config.depConfig.plugin.api.useLocal) {
6+
maven() {
77
url new File("maven")
88
}
99
}
@@ -24,11 +24,8 @@ buildscript {
2424
}
2525

2626
dependencies {
27-
// 根据 config 来 configClasspath 各 plugin
28-
Config.depConfig.plugin.each { name, config ->
29-
if (config.isApply) {
30-
classpath config.remotePath
31-
}
27+
for (def entrySet : ConfigUtils.getApplyPlugins().entrySet()) {
28+
classpath entrySet.value.dep
3229
}
3330
}
3431
}

buildApp.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ android {
4040
exclude 'META-INF/*'
4141
}
4242

43-
lintOptions {
44-
abortOnError false
45-
}
46-
4743
dexOptions {
4844
preDexLibraries true
4945
javaMaxHeapSize "8g"
@@ -81,7 +77,7 @@ def configSigning() {
8177
File signPropertiesFile = file("${rootDir.path}/sign/keystore.properties")
8278
if (!signPropertiesFile.exists()) return
8379

84-
GLog.log("$project.name config sign start...")
80+
GLog.d("${project.toString()} sign start...")
8581
project.android {
8682
Properties properties = new Properties()
8783
properties.load(new FileInputStream(signPropertiesFile))
@@ -95,7 +91,7 @@ def configSigning() {
9591
}
9692
buildTypes.release.signingConfig signingConfigs.release
9793
}
98-
GLog.log("$project.name config sign end...")
94+
GLog.d("${project.toString()} sign end...")
9995
}
10096

10197
def configApkName() {

buildSrc/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
repositories {
2+
google()
3+
jcenter()
4+
}
5+
16
apply {
27
plugin 'groovy'
38
plugin 'java-gradle-plugin'
@@ -20,6 +25,7 @@ gradlePlugin {
2025
dependencies {
2126
implementation gradleApi()
2227
implementation localGroovy()
28+
implementation "commons-io:commons-io:2.6"
2329
}
2430

2531
sourceSets {

buildSrc/src/main/groovy/BuildConfig.groovy

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

buildSrc/src/main/groovy/Config.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Config {
2323
static leakcanary_version = '1.6.3'
2424

2525
// appConfig 配置的是可以跑 app 的模块,git 提交务必只包含 launcher
26-
static appConfig = ['launcher', 'main']
26+
static appConfig = ['launcher']
2727
// pkgConfig 配置的是要依赖的功能包,为空则依赖全部,git 提交务必为空
2828
static pkgConfig = ['main', 'utilcode']
2929

@@ -38,8 +38,8 @@ class Config {
3838
// 本地第一次上传插件新的版本需设置 useLocal = true, isApply = false
3939
// 本地上传成功之后 isApply = true 即可应用插件来调试,后续版本更新无需设置 isApply = false
4040
// 发布版本的话把 useLocal = false, isApply = false,发布成功后 isApply = true 即可使用远程库版本
41-
api : new DepConfig(true/*是否本地调试*/, "", "com.blankj:api-gradle-plugin:1.0", true),
42-
bus : new DepConfig(true/*是否本地调试*/, "", "com.blankj:bus-gradle-plugin:2.0", true),
41+
api : new DepConfig(true/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.0", true/*是否使用插件*/),
42+
bus : new DepConfig(true/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.0", true/*是否使用插件*/),
4343
],
4444

4545
api_gradle_plugin: new DepConfig(":plugin:api-gradle-plugin", true),
@@ -98,7 +98,7 @@ class Config {
9898
gson : new DepConfig("com.google.code.gson:gson:2.8.2"),
9999
glide : new DepConfig("com.github.bumptech.glide:glide:4.7.1"),
100100
retrofit : new DepConfig("com.squareup.retrofit2:retrofit:2.4.0"),
101-
commons_io : new DepConfig("commons-io:commons-io:2.5"),
101+
commons_io : new DepConfig("commons-io:commons-io:2.6"),
102102

103103
test : [
104104
junit : new DepConfig("junit:junit:4.12"),

0 commit comments

Comments
 (0)