Skip to content

Commit 08ddfce

Browse files
BlankjBlankj
committed
see 06/03 log
1 parent fdad02a commit 08ddfce

File tree

50 files changed

+642
-436
lines changed

Some content is hidden

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

50 files changed

+642
-436
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `19/06/03` [fix] Refactoring framework. Publish v1.24.0.
12
* `19/04/25` [fix] LogUtils delete due log.
23
* `19/04/24` [upd] The swipe panel.
34
* `19/03/17` [fix] The ugly UI.

‎build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
repositories {
4-
if (!gradle.ext.bus.isPublish) {
5-
if (gradle.ext.bus.isDebug) {
6-
maven() {
7-
url uri(new File(project.rootDir, "maven"))
8-
}
4+
if (gradle.ext.depConfig.plugin_bus.useLocal) {
5+
maven() {
6+
// use for debug plugin local
7+
url new File("busMaven")
98
}
109
}
1110
google()
1211
jcenter()
1312
}
1413

1514
dependencies {
16-
for (plugin in gradle.ext.dep.plugin) {
17-
if (gradle.ext.bus.isPublish && plugin.contains("com.blankj:bus-gradle-plugin:")) {
18-
continue
15+
// 根据 config 来 configClasspath 各 plugin
16+
gradle.ext.depConfig.each { name, config ->
17+
if (name.startsWith("plugin_") && config.isApply) {
18+
classpath config.remotePath
1919
}
20-
classpath plugin
2120
}
2221
}
2322
}
23+
2424
allprojects {
2525
repositories {
2626
google()

‎bus-gradle-plugin/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Change Log
22

3+
## v1.8
4+
兼容最新工程组件化
5+
36
## v1.7
47
兼容 utilcodex
58

‎bus-gradle-plugin/build.gradle

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ apply {
66
plugin "groovy"
77
plugin "java-gradle-plugin"
88
from "${rootDir.path}/gradle/upload/pluginPublish.gradle"
9-
if (gradle.ext.bus.isDebug) {
9+
if (gradle.ext.depConfig.plugin_bus.useLocal) {
1010
plugin "maven"
11-
from "${rootDir.path}/gradle/upload/localMavenUpload.gradle"
1211
} else {
1312
plugin "com.github.dcendents.android-maven"
1413
plugin "com.jfrog.bintray"
@@ -51,8 +50,18 @@ sourceSets {
5150
}
5251
}
5352

54-
group = gradle.ext.bus.group
55-
version = gradle.ext.bus.version
53+
group = gradle.ext.depConfig.plugin_bus.groupId
54+
version = gradle.ext.depConfig.plugin_bus.version
55+
56+
if (gradle.ext.depConfig.plugin_bus.useLocal) {
57+
uploadArchives {
58+
repositories {
59+
mavenDeployer {
60+
repository(url: uri(new File(project.rootDir, "busMaven")))
61+
}
62+
}
63+
}
64+
}
5665

5766
//./gradlew bus-gradle-plugin:bintrayUpload
5867
//./gradlew publishPlugins

‎bus-gradle-plugin/com/blankj/bus/BusUtils.class

-1.71 KB
Binary file not shown.

‎bus-gradle-plugin/src/main/java/com/blankj/bus/BusTransform.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ class BusTransform extends Transform {
8484
)
8585
FileUtils.copyFile(jar, dest)
8686

87-
if (jarName.contains("utilcode")) {
87+
if (jarName.startsWith("com.blankj:utilcode:")
88+
|| jarName.startsWith("com.blankj:utilcodex:")
89+
|| jarName.equals(":utilcode:lib")) {
8890
busScan.busJar = dest
8991
LogUtils.l("bus jar: $jarName [$dest]")
9092
return

‎bus-gradle-plugin/src/main/java/com/blankj/bus/BusTransformAsm.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ class BusTransformAsm extends Transform {
114114
)
115115
FileUtils.copyFile(jar, dest)
116116

117-
if (jarName.contains("utilcode")) {
117+
if (jarName.startsWith("com.blankj:utilcode:")
118+
|| jarName.startsWith("com.blankj:utilcodex:")
119+
|| jarName.equals(":utilcode:lib")) {
118120
busScan.busJar = dest
119121
LogUtils.l("bus jar: $jarName [$dest]")
120122
return

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-groovydoc.jar

67.4 KB
Binary file not shown.

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-groovydoc.jar.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f066bbc77d59ce6c1379873e5a89715e

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-groovydoc.jar.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
27634ae190af35cf8cdd4acb5a0450a5f76d85e9

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-javadoc.jar

32.1 KB
Binary file not shown.

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-javadoc.jar.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d1f3a078f25631446d7f61a2b3f13b87

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-javadoc.jar.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
46debaa90519ccdb6aabb7034d5ac1a43c466c47

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-sources.jar

22.4 KB
Binary file not shown.

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-sources.jar.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
704f0fc2f320ad82e43447dcac14050d

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0-sources.jar.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
456c915220fe181bed8c67bef1568f70e7b0f1d1

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0.jar

55.2 KB
Binary file not shown.

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0.jar.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
55bd3f4ad26b78c15c747c22a0633f4d

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0.jar.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1b448aa58fcd10792e28db88c2a6813207dbee2e

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0.pom

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>com.blankj</groupId>
6+
<artifactId>bus-gradle-plugin</artifactId>
7+
<version>1.7.0</version>
8+
<dependencies>
9+
<dependency>
10+
<groupId>com.android.tools.build</groupId>
11+
<artifactId>gradle</artifactId>
12+
<version>3.4.0</version>
13+
<scope>runtime</scope>
14+
</dependency>
15+
<dependency>
16+
<groupId>com.android.tools.build</groupId>
17+
<artifactId>gradle-api</artifactId>
18+
<version>3.4.0</version>
19+
<scope>runtime</scope>
20+
</dependency>
21+
<dependency>
22+
<groupId>org.javassist</groupId>
23+
<artifactId>javassist</artifactId>
24+
<version>3.24.0-GA</version>
25+
<scope>runtime</scope>
26+
</dependency>
27+
<dependency>
28+
<groupId>commons-io</groupId>
29+
<artifactId>commons-io</artifactId>
30+
<version>2.5</version>
31+
<scope>runtime</scope>
32+
</dependency>
33+
<dependency>
34+
<groupId>junit</groupId>
35+
<artifactId>junit</artifactId>
36+
<version>4.12</version>
37+
<scope>test</scope>
38+
</dependency>
39+
</dependencies>
40+
</project>

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0.pom.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
03dd0e6302a92e8849d59866a2b2bf85

‎busMaven/com/blankj/bus-gradle-plugin/1.7.0/bus-gradle-plugin-1.7.0.pom.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ce864f19c593951f14bc93fd812fe4251cad7098

‎busMaven/com/blankj/bus-gradle-plugin/maven-metadata.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<metadata>
3+
<groupId>com.blankj</groupId>
4+
<artifactId>bus-gradle-plugin</artifactId>
5+
<versioning>
6+
<release>1.7.0</release>
7+
<versions>
8+
<version>1.7.0</version>
9+
</versions>
10+
<lastUpdated>20190603071129</lastUpdated>
11+
</versioning>
12+
</metadata>

‎busMaven/com/blankj/bus-gradle-plugin/maven-metadata.xml.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
88dc3791e85eb3ccba2f1bb9d71dccbb

‎busMaven/com/blankj/bus-gradle-plugin/maven-metadata.xml.sha1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3c87365d79cf58e5eecaa328aceab560914ecd78

0 commit comments

Comments
 (0)