Skip to content

Commit 8a47092

Browse files
committed
Merge branch '1.24.0'
2 parents 04de313 + 41d32a0 commit 8a47092

File tree

10,632 files changed

+5535
-2577
lines changed

Some content is hidden

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

10,632 files changed

+5535
-2577
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
/captures
99
.externalNativeBuild
1010
/apk
11+
*.phrof
1112
/maven

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ before_install:
2121
- yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.2"
2222

2323
script:
24-
- ./gradlew build connectedCheck --info
24+
- ./gradlew build connectedCheck

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* `19/06/03` [fix] Refactoring framework. Publish v1.24.0.
2+
* `19/04/25` [fix] LogUtils delete due log.
3+
* `19/04/24` [upd] The swipe panel.
4+
* `19/03/17` [fix] The ugly UI.
5+
* `19/03/14` [fix] AdaptScreenUtils didn't work on some HaWei tablet.
16
* `19/03/08` [add] LogUtils support multi process. Publish v1.23.7.
27
* `19/03/02` [fix] LogUtils#file.
38
* `19/02/28` [fix] ImageUtils#calculateInSampleSize. Publish v1.23.6.

README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.7-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.7-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

build.gradle

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
apply from: 'config.gradle'
43
repositories {
5-
if (bus.isDebug) {
4+
if (gradle.ext.depConfig.plugin_bus.useLocal) {
65
maven() {
7-
url uri(new File(project.rootDir, "maven"))
6+
// use for debug plugin local
7+
url new File("busMaven")
88
}
99
}
1010
google()
1111
jcenter()
1212
}
1313

1414
dependencies {
15-
for (plugin in dep.plugin) {
16-
classpath plugin
15+
// 根据 config 来 configClasspath 各 plugin
16+
gradle.ext.depConfig.each { name, config ->
17+
if (name.startsWith("plugin_") && config.isApply) {
18+
classpath config.remotePath
19+
}
1720
}
1821
}
1922
}
@@ -30,7 +33,7 @@ allprojects {
3033
resolutionStrategy.eachDependency {
3134
if (it.requested.group == 'com.android.support'
3235
&& !it.requested.name.contains('multidex')) {
33-
it.useVersion support_version
36+
it.useVersion gradle.ext.support_version
3437
}
3538
}
3639
}

bus-gradle-plugin/CHANGELOG.md

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

3+
## v1.8
4+
兼容最新工程组件化
5+
6+
## v1.7
7+
兼容 utilcodex
8+
39
## v1.6
410
修复 inject 时候 zip 操作不对导致混淆出错的问题
511

bus-gradle-plugin/build.gradle

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ plugins {
55
apply {
66
plugin "groovy"
77
plugin "java-gradle-plugin"
8-
from "${rootDir.path}/gradle/pluginPublish.gradle"
9-
if (bus.isDebug) {
8+
from "${rootDir.path}/gradle/upload/pluginPublish.gradle"
9+
if (gradle.ext.depConfig.plugin_bus.useLocal) {
1010
plugin "maven"
11-
from "${rootDir.path}/gradle/localMavenUpload.gradle"
1211
} else {
1312
plugin "com.github.dcendents.android-maven"
1413
plugin "com.jfrog.bintray"
15-
from "${rootDir.path}/gradle/bintrayUploadJava.gradle"
14+
from "${rootDir.path}/gradle/upload/bintrayUploadJava.gradle"
1615
}
1716
}
1817

@@ -26,13 +25,15 @@ gradlePlugin {
2625
}
2726

2827
dependencies {
29-
implementation dep.plugin[0]
30-
implementation dep.javassist
31-
implementation dep.commons_io
28+
implementation "com.android.tools.build:gradle:3.4.0"
29+
implementation "com.android.tools.build:gradle-api:3.4.0"
30+
31+
implementation gradle.ext.dep.javassist
32+
implementation gradle.ext.dep.commons_io
3233
implementation gradleApi()
3334
implementation localGroovy()
3435

35-
testImplementation dep.junit
36+
testImplementation gradle.ext.dep.junit
3637
}
3738

3839
sourceSets {
@@ -49,8 +50,18 @@ sourceSets {
4950
}
5051
}
5152

52-
group = bus.group
53-
version = 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+
}
5465

5566
//./gradlew bus-gradle-plugin:bintrayUpload
5667
//./gradlew publishPlugins
-1.71 KB
Binary file not shown.

bus-gradle-plugin/project.properties

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#project
2+
project.name=StaticBusPlugin
3+
project.groupId=com.blankj
4+
project.artifactId=bus-gradle-plugin
5+
project.packaging=aar
6+
project.siteUrl=https://github.com/Blankj/AndroidUtilCode
7+
project.gitUrl=https://github.com/Blankj/AndroidUtilCode.git
8+
#javadoc
9+
javadoc.name=StaticBusPlugin

0 commit comments

Comments
 (0)