Skip to content

Commit 208aee9

Browse files
author
Blankj
committed
see 06/05 log
1 parent 0d3390c commit 208aee9

85 files changed

Lines changed: 166 additions & 325 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
.externalNativeBuild
1010
/apk
1111
*.phrof
12+
/busMaven

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android:
1818
email: false
1919

2020
before_install:
21-
- yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.2"
21+
- yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.2"
2222

2323
script:
2424
- ./gradlew build connectedCheck

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.blankj.bus
33
import com.android.build.gradle.AppExtension
44
import com.android.build.gradle.AppPlugin
55
import com.blankj.util.LogUtils
6-
76
import org.gradle.api.Plugin
87
import org.gradle.api.Project
98

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ class BusScan {
9090
String temp = longMethodName.substring(0, i);
9191
int j = temp.lastIndexOf('.');
9292
String sign = method.getReturnType().getName() + ' ' +
93-
longMethodName.substring(0, j) +
94-
".INSTANCE" +
95-
longMethodName.substring(j);
93+
longMethodName.substring(0, j) +
94+
".INSTANCE" +
95+
longMethodName.substring(j);
9696
busStaticMap.put(name, sign);
9797
return true
9898
} catch (NotFoundException ignore) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class BusTransformAsm extends Transform {
5252
def referencedInputs = transformInvocation.getReferencedInputs()
5353
def isIncremental = transformInvocation.isIncremental()
5454

55-
if(!isIncremental) {
55+
if (!isIncremental) {
5656
outputProvider.deleteAll();
5757
}
5858

@@ -74,8 +74,8 @@ class BusTransformAsm extends Transform {
7474

7575
LogUtils.l("scan dir: $dir [$dest]")
7676

77-
if(isIncremental) {
78-
switch(status) {
77+
if (isIncremental) {
78+
switch (status) {
7979
case Status.NOTCHANGED:
8080
break;
8181
case Status.ADDED:
@@ -90,7 +90,7 @@ class BusTransformAsm extends Transform {
9090
}
9191
} else {
9292
//Forgive me!, Some project will store 3rd-party aar for serveral copies in dexbuilder folder,,unknown issue.
93-
if(inDuplcatedClassSafeMode() & !isIncremental && !flagForCleanDexBuilderFolder) {
93+
if (inDuplcatedClassSafeMode() & !isIncremental && !flagForCleanDexBuilderFolder) {
9494
cleanDexBuilderFolder(dest);
9595
flagForCleanDexBuilderFolder = true;
9696
}

‎gradle.properties‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
# Project-wide Gradle settings.
2-
32
# IDE (e.g. Android Studio) users:
43
# Gradle settings configured through the IDE *will override*
54
# any settings specified in this file.
6-
75
# For more details on how to configure your build environment visit
86
# http://www.gradle.org/docs/current/userguide/build_environment.html
9-
107
# Specifies the JVM arguments used for the daemon process.
118
# The setting is particularly useful for tweaking memory settings.
129
# Default value: -Xmx10248m -XX:MaxPermSize=256m
1310
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14-
1511
# When configured, Gradle will run in incubating parallel mode.
1612
# This option should only be used with decoupled projects. More details, visit
1713
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1814
# org.gradle.parallel=true
19-
2015
#org.gradle.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
21-
2216
org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
2317
org.gradle.daemon=true
2418
org.gradle.configureondemand=true

‎gradle/config/config.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ gradle.ext {
2525
plugin_bintray : new DepConfig("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"),// 上传到 bintray
2626
plugin_traute : new DepConfig("tech.harmonysoft:traute-gradle:1.1.10"),// 注解转非空判断
2727

28-
plugin_bus : new DepConfig(true/*是否本地调试*/, "", "com.blankj:bus-gradle-plugin:1.8", true),
28+
plugin_bus : new DepConfig(false/*是否本地调试*/, "", "com.blankj:bus-gradle-plugin:1.8", true),
2929

3030
buildSrc : new DepConfig(":buildSrc"),
3131
bus_gradle_plugin : new DepConfig(":bus-gradle-plugin", true),

‎gradle/config/configApp.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies {
5959

6060
private String getSuffix() {
6161
if (project.path == ":launcher:app") return ""
62-
return project.path.replace(":" , "_").substring(0, project.path.length() - 4)
62+
return project.path.replace(":", "_").substring(0, project.path.length() - 4)
6363
}
6464

6565
def configSigning(Project pro) {

‎gradle/util/utils.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def log(Object content) {
99
}
1010

1111
gradle.ext.Utils = [
12-
log : this.&log,
12+
log : this.&log,
1313
object2String: LogFormatter.&object2String,
1414
]
1515

‎launcher/pkg/src/main/res/layout/activity_main.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:app="http://schemas.android.com/apk/res-auto"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent">

0 commit comments

Comments
 (0)