Skip to content

Commit 3ff340e

Browse files
committed
see 05/29 log
1 parent 37fd0e2 commit 3ff340e

Some content is hidden

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

46 files changed

+1044
-564
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

build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
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.isPublish) {
6-
if (bus.isDebug) {
4+
if (!gradle.ext.bus.isPublish) {
5+
if (gradle.ext.bus.isDebug) {
76
maven() {
87
url uri(new File(project.rootDir, "maven"))
98
}
@@ -14,15 +13,14 @@ buildscript {
1413
}
1514

1615
dependencies {
17-
for (plugin in dep.plugin) {
18-
if (bus.isPublish && plugin.contains("com.blankj:bus-gradle-plugin:")) {
16+
for (plugin in gradle.ext.dep.plugin) {
17+
if (gradle.ext.bus.isPublish && plugin.contains("com.blankj:bus-gradle-plugin:")) {
1918
continue
2019
}
2120
classpath plugin
2221
}
2322
}
2423
}
25-
2624
allprojects {
2725
repositories {
2826
google()
@@ -35,7 +33,7 @@ allprojects {
3533
resolutionStrategy.eachDependency {
3634
if (it.requested.group == 'com.android.support'
3735
&& !it.requested.name.contains('multidex')) {
38-
it.useVersion support_version
36+
it.useVersion gradle.ext.support_version
3937
}
4038
}
4139
}

bus-gradle-plugin/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ 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.bus.isDebug) {
1010
plugin "maven"
11-
from "${rootDir.path}/gradle/localMavenUpload.gradle"
11+
from "${rootDir.path}/gradle/upload/localMavenUpload.gradle"
1212
} else {
1313
plugin "com.github.dcendents.android-maven"
1414
plugin "com.jfrog.bintray"
15-
from "${rootDir.path}/gradle/bintrayUploadJava.gradle"
15+
from "${rootDir.path}/gradle/upload/bintrayUploadJava.gradle"
1616
}
1717
}
1818

@@ -29,12 +29,12 @@ dependencies {
2929
implementation "com.android.tools.build:gradle:3.4.0"
3030
implementation "com.android.tools.build:gradle-api:3.4.0"
3131

32-
implementation dep.javassist
33-
implementation dep.commons_io
32+
implementation gradle.ext.dep.javassist
33+
implementation gradle.ext.dep.commons_io
3434
implementation gradleApi()
3535
implementation localGroovy()
3636

37-
testImplementation dep.junit
37+
testImplementation gradle.ext.dep.junit
3838
}
3939

4040
sourceSets {
@@ -51,8 +51,8 @@ sourceSets {
5151
}
5252
}
5353

54-
group = bus.group
55-
version = bus.version
54+
group = gradle.ext.bus.group
55+
version = gradle.ext.bus.version
5656

5757
//./gradlew bus-gradle-plugin:bintrayUpload
5858
//./gradlew publishPlugins

config.gradle

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

config_app.gradle

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

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919

20-
#org.gradle.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
20+
#org.gradle.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
21+
22+
org.gradle.jvmargs=-XX:MaxHeapSize=1024m -Xmx1024m

0 commit comments

Comments
 (0)