Skip to content

Commit 480447d

Browse files
committed
see 03/27 log
1 parent d21758b commit 480447d

File tree

11 files changed

+208
-125
lines changed

11 files changed

+208
-125
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `20/03/27` [opt] publish.gradle
12
* `20/01/17` [upd] Leak Canary to v2.1.
23
* `19/11/30` [add] Publish bus plugin v2.4. Publish api plugin v1.2.
34
* `19/11/28` [add] Publish v1.26.0.

buildSrc/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ gradlePlugin {
1212
plugins {
1313
readmeCore {
1414
id = 'readme-core'
15-
implementationClass = 'com.blankj.plugin.ReadmeCorePlugin'
15+
implementationClass = 'com.blankj.plugin.readme.ReadmeCorePlugin'
1616
}
1717

1818
readmeSub {
1919
id = 'readme-sub'
20-
implementationClass = 'com.blankj.plugin.ReadmeSubPlugin'
20+
implementationClass = 'com.blankj.plugin.readme.ReadmeSubPlugin'
2121
}
2222
}
2323
}

buildSrc/src/main/groovy/Config.groovy

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Config {
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 29
1717
static versionCode = 1_026_001
18-
static versionName = '1.26.1-alpha8'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.26.1-r5'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static gradlePluginVersion = '3.5.0'
@@ -50,15 +50,14 @@ class Config {
5050
plugin_bintray : new DepConfig(pluginPath: "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4", pluginId: "com.jfrog.bintray"),// 上传到 bintray
5151
plugin_traute : new DepConfig(pluginPath: "tech.harmonysoft:traute-gradle:1.1.10", pluginId: "tech.harmonysoft.oss.traute"),// 注解转非空判断
5252

53-
// 本地第一次上传插件新的版本需设置 isApply = false, useLocal = true
54-
// 本地上传成功之后 isApply = true 即可应用插件来调试,后续版本更新无需设置 isApply = false
55-
// 发布版本的话把 isApply = false, useLocal = false,更新版本号,发布成功后 isApply = true 即可使用远程库版本
56-
plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.2", pluginId: "com.blankj.api"),
57-
//./gradlew plugin:api-gradle-plugin:uploadArchives // 上传到本地 maven
58-
//./gradlew plugin:api-gradle-plugin:bintrayUpload // 上传到 jcenter
53+
// 上传新版本插件更新 pluginPath 中的版本号,并设置 isApply = false
54+
// 通过 mavenLocal 上传本地版本,设置 isApply = true 即可应用插件来调试,最后通过 bintrayUpload 来发布插件
55+
plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.2-r0", pluginId: "com.blankj.api"),
56+
//./gradlew plugin:plugin_api-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
57+
//./gradlew plugin:plugin_api-gradle-plugin:bintrayUpload // 上传到 jcenter
5958
plugin_bus : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.4", pluginId: "com.blankj.bus"),
60-
//./gradlew plugin:bus-gradle-plugin:uploadArchives // 上传到本地 maven
61-
//./gradlew plugin:bus-gradle-plugin:bintrayUpload // 上传到 jcenter
59+
//./gradlew plugin:plugin_bus-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
60+
//./gradlew plugin:plugin_bus-gradle-plugin:bintrayUpload // 上传到 jcenter
6261

6362
support_appcompat_v7 : new DepConfig("com.android.support:appcompat-v7:$supportVersion"),
6463
support_design : new DepConfig("com.android.support:design:$supportVersion"),

buildSrc/src/main/java/com/blankj/plugin/FormatUtils.groovy renamed to buildSrc/src/main/java/com/blankj/plugin/readme/FormatUtils.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.plugin
1+
package com.blankj.plugin.readme
22

33
class FormatUtils {
44

buildSrc/src/main/java/com/blankj/plugin/ReadmeCorePlugin.groovy renamed to buildSrc/src/main/java/com/blankj/plugin/readme/ReadmeCorePlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.plugin
1+
package com.blankj.plugin.readme
22

33
import org.gradle.api.Plugin
44
import org.gradle.api.Project

buildSrc/src/main/java/com/blankj/plugin/ReadmeExtension.groovy renamed to buildSrc/src/main/java/com/blankj/plugin/readme/ReadmeExtension.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.plugin
1+
package com.blankj.plugin.readme
22

33
class ReadmeExtension {
44

buildSrc/src/main/java/com/blankj/plugin/ReadmeSubPlugin.groovy renamed to buildSrc/src/main/java/com/blankj/plugin/readme/ReadmeSubPlugin.groovy

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
package com.blankj.plugin
1+
package com.blankj.plugin.readme
22

33
import org.gradle.api.Plugin
44
import org.gradle.api.Project
55

6-
import static FormatUtils.LINE_SEP
7-
8-
96
class ReadmeSubPlugin implements Plugin<Project> {
107

118
@Override
@@ -30,9 +27,9 @@ class ReadmeSubPlugin implements Plugin<Project> {
3027
static def readmeOfSubUtil2Eng(File readmeCN, File readmeEng) {
3128
FormatUtils.format(readmeCN)
3229
def lines = readmeCN.readLines("UTF-8"),
33-
sb = new StringBuilder("## How to use" + LINE_SEP
34-
+ LINE_SEP +
35-
"You should copy the following classes which you want to use in your project." + LINE_SEP),
30+
sb = new StringBuilder("## How to use" + FormatUtils.LINE_SEP
31+
+ FormatUtils.LINE_SEP +
32+
"You should copy the following classes which you want to use in your project." + FormatUtils.LINE_SEP),
3633
i = 3,
3734
size = lines.size()
3835
for (; i < size; ++i) {
@@ -45,7 +42,7 @@ class ReadmeSubPlugin implements Plugin<Project> {
4542
} else {
4643
sb.append(line)
4744
}
48-
sb.append(LINE_SEP)
45+
sb.append(FormatUtils.LINE_SEP)
4946
}
5047
readmeEng.write(sb.toString(), "UTF-8")
5148
}

0 commit comments

Comments
 (0)