Skip to content

Commit ac872f8

Browse files
CaiMengjieBlankj
authored andcommitted
fix: ci
1 parent ccba200 commit ac872f8

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

buildSrc/src/main/groovy/Config.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Config {
3434
lib_base : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/base"),
3535
lib_common : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/common"),
3636
lib_subutil : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/subutil"),
37-
lib_utilcode : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/utilcode", remotePath: "com.blankj:utilcodex:$Config.versionName"),
37+
lib_utilcode : new ModuleConfig(isApply: true , useLocal: false, localPath: "./lib/utilcode", remotePath: "com.blankj:utilcodex:$Config.versionName"),
3838
lib_utildebug : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/utildebug"),
3939
lib_utildebug_no_op : new ModuleConfig(isApply: true , useLocal: true , localPath: "./lib/utildebug-no-op"),
4040
/*Don't delete this line*/
@@ -54,7 +54,7 @@ class Config {
5454
plugin_bus : new PluginConfig(isApply: true, useLocal: false, path: "com.blankj:bus-gradle-plugin:2.6", id: "com.blankj.bus"),
5555
//./gradlew clean :plugin_bus-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
5656
//./gradlew clean :plugin_bus-gradle-plugin:bintrayUpload // 上传到 jcenter
57-
plugin_buildSrc: new PluginConfig(isApply: true, useLocal: false, path: "com.blankj:buildSrc-plugin:1.0", id: "com.blankj.buildSrc"),
57+
plugin_buildSrc: new PluginConfig(isApply: false, useLocal: false, path: "com.blankj:buildSrc-plugin:1.0", id: "com.blankj.buildSrc"),
5858
//./gradlew clean :plugin_bus-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
5959
//./gradlew clean :plugin_bus-gradle-plugin:bintrayUpload // 上传到 jcenter
6060
]

config/publish.gradle

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,14 @@ apply plugin: 'signing'
2727
ext.multiPublishMode = true
2828

2929
File localPropertiesFile = project.rootProject.file("local.properties");
30-
if (localPropertiesFile.exists()) {
31-
Properties properties = new Properties()
32-
properties.load(new FileInputStream(localPropertiesFile))
33-
properties.each { name, value -> ext[name] = value }
34-
} else {
35-
if (!ext["signing.keyId"] && !ext["signing.password"] && !ext["signing.secretKeyRingFile"]
36-
&& !ext["ossrhUsername"] && !ext["ossrhPassword"]) {
37-
throw new NullPointerException("U should set MavenCentral params in local.properties")
38-
}
30+
if (!localPropertiesFile.exists()) {
31+
return
3932
}
4033

34+
Properties properties = new Properties()
35+
properties.load(new FileInputStream(localPropertiesFile))
36+
properties.each { name, value -> ext[name] = value }
37+
4138
afterEvaluate {
4239
def ext = project.ext
4340
publishing {

module_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{"name": "lib_base", "isApply": true, "useLocal": true, "localPath": "./lib/base"},
2424
{"name": "lib_common", "isApply": true, "useLocal": true, "localPath": "./lib/common"},
2525
{"name": "lib_subutil", "isApply": true, "useLocal": true, "localPath": "./lib/subutil"},
26-
{"name": "lib_utilcode", "isApply": true, "useLocal": true, "localPath": "./lib/utilcode", "remotePath": "com.blankj:utilcodex:$Config.versionName"},
26+
{"name": "lib_utilcode", "isApply": true, "useLocal": false, "localPath": "./lib/utilcode", "remotePath": "com.blankj:utilcodex:$Config.versionName"},
2727
{"name": "lib_utildebug", "isApply": true, "useLocal": true, "localPath": "./lib/utildebug"},
2828
{"name": "lib_utildebug_no_op", "isApply": true, "useLocal": true, "localPath": "./lib/utildebug-no-op"}
2929
]

0 commit comments

Comments
 (0)