Skip to content

Commit

Permalink
add support for Travis ci
Browse files Browse the repository at this point in the history
  • Loading branch information
@achellies
achellies committed Jan 19, 2017
1 parent 5d11a60 commit b265004
Show file tree
Hide file tree
Showing 7 changed files with 332 additions and 3 deletions.
12 changes: 12 additions & 0 deletions .travis.yml
View file
@@ -0,0 +1,12 @@
language: android
android:
components:
- build-tools-24.0.1
- android-24
- extra-android-m2repository
- extra-android-support
licenses:
- 'android-sdk-license-.+'

script:
- ./gradlew build connectedCheck
0 script/style/checkstyle.xml → config/style/checkstyle.xml
View file
File renamed without changes.
105 changes: 105 additions & 0 deletions payload_reader/config/checkstyle/checkstyle.xml
View file
@@ -0,0 +1,105 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<module name="TreeWalker">
<!-- Annotations -->
<module name="AnnotationUseStyle"/>
<module name="MissingDeprecated"/>

<!-- Block checks -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>

<!-- Class design -->
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
<module name="MutableException"/>

<!-- Coding -->
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="EmptyStatement"/>
<module name="EqualsAvoidNull"/>
<module name="EqualsHashCode"/>
<module name="ExplicitInitialization"/>
<module name="FallThrough"/>
<module name="FinalLocalVariable"/>
<module name="IllegalInstantiation"/>
<module name="IllegalToken"/>
<module name="IllegalTokenText"/>
<module name="IllegalType"/>
<module name="ModifiedControlVariable"/>
<module name="MultipleVariableDeclarations"/>
<module name="NoClone"/>
<module name="NoFinalizer"/>
<module name="OneStatementPerLine"/>
<module name="ParameterAssignment"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
<module name="UnnecessaryParentheses"/>
<module name="VariableDeclarationUsageDistance"/>

<!-- Imports -->
<module name="AvoidStarImport"/>
<module name="AvoidStaticImport">
<property name="excludes" value="java.util.Collections.emptyList"/>
<property name="excludes" value="org.mockito.Mockito.*"/>
<property name="excludes" value="rx.android.schedulers.AndroidSchedulers.*"/>
</module>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>

<!-- Miscellaneous -->
<module name="ArrayTypeStyle"/>
<module name="CommentsIndentation"/>
<module name="FinalParameters"/>
<module name="Indentation">
<property name="basicOffset" value="4"/>
<property name="arrayInitIndent" value="4"/>
<property name="caseIndent" value="4"/>
<property name="throwsIndent" value="4"/>
<property name="lineWrappingIndentation" value="4"/>
</module>

<!-- Modifiers -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>

<!-- Whitespace -->
<module name="EmptyForInitializerPad"/>
<module name="GenericWhitespace"/>
<module name="MethodParamPad"/>
<module name="NoLineWrap"/>
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="ParenPad"/>
<module name="SeparatorWrap">
<property name="option" value="nl"/>
<property name="tokens" value="DOT"/>
</module>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>

<module name="PackageName">
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
</module>

<module name="UpperEll" />
</module>

<module name="FileLength">
<property name="max" value="800"/>
</module>

<module name="FileTabCharacter"/>

<module name="NewlineAtEndOfFile"/>
</module>
105 changes: 105 additions & 0 deletions payload_writer/config/checkstyle/checkstyle.xml
View file
@@ -0,0 +1,105 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<module name="TreeWalker">
<!-- Annotations -->
<module name="AnnotationUseStyle"/>
<module name="MissingDeprecated"/>

<!-- Block checks -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>

<!-- Class design -->
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
<module name="MutableException"/>

<!-- Coding -->
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="EmptyStatement"/>
<module name="EqualsAvoidNull"/>
<module name="EqualsHashCode"/>
<module name="ExplicitInitialization"/>
<module name="FallThrough"/>
<module name="FinalLocalVariable"/>
<module name="IllegalInstantiation"/>
<module name="IllegalToken"/>
<module name="IllegalTokenText"/>
<module name="IllegalType"/>
<module name="ModifiedControlVariable"/>
<module name="MultipleVariableDeclarations"/>
<module name="NoClone"/>
<module name="NoFinalizer"/>
<module name="OneStatementPerLine"/>
<module name="ParameterAssignment"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
<module name="UnnecessaryParentheses"/>
<module name="VariableDeclarationUsageDistance"/>

<!-- Imports -->
<module name="AvoidStarImport"/>
<module name="AvoidStaticImport">
<property name="excludes" value="java.util.Collections.emptyList"/>
<property name="excludes" value="org.mockito.Mockito.*"/>
<property name="excludes" value="rx.android.schedulers.AndroidSchedulers.*"/>
</module>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>

<!-- Miscellaneous -->
<module name="ArrayTypeStyle"/>
<module name="CommentsIndentation"/>
<module name="FinalParameters"/>
<module name="Indentation">
<property name="basicOffset" value="4"/>
<property name="arrayInitIndent" value="4"/>
<property name="caseIndent" value="4"/>
<property name="throwsIndent" value="4"/>
<property name="lineWrappingIndentation" value="4"/>
</module>

<!-- Modifiers -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>

<!-- Whitespace -->
<module name="EmptyForInitializerPad"/>
<module name="GenericWhitespace"/>
<module name="MethodParamPad"/>
<module name="NoLineWrap"/>
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="ParenPad"/>
<module name="SeparatorWrap">
<property name="option" value="nl"/>
<property name="tokens" value="DOT"/>
</module>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>

<module name="PackageName">
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
</module>

<module name="UpperEll" />
</module>

<module name="FileLength">
<property name="max" value="800"/>
</module>

<module name="FileTabCharacter"/>

<module name="NewlineAtEndOfFile"/>
</module>
2 changes: 1 addition & 1 deletion quality.gradle
View file
Expand Up @@ -7,7 +7,7 @@ checkstyle {
}

task checkstyle(type: Checkstyle) {
configFile file("${project.rootDir}/script/style/checkstyle.xml")
configFile rootProject.file("config/style/checkstyle.xml")
source 'src'
include '**/*.java'
exclude '**/gen/**'
Expand Down
105 changes: 105 additions & 0 deletions walle-cli/config/checkstyle/checkstyle.xml
View file
@@ -0,0 +1,105 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<module name="TreeWalker">
<!-- Annotations -->
<module name="AnnotationUseStyle"/>
<module name="MissingDeprecated"/>

<!-- Block checks -->
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>

<!-- Class design -->
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
<module name="MutableException"/>

<!-- Coding -->
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="EmptyStatement"/>
<module name="EqualsAvoidNull"/>
<module name="EqualsHashCode"/>
<module name="ExplicitInitialization"/>
<module name="FallThrough"/>
<module name="FinalLocalVariable"/>
<module name="IllegalInstantiation"/>
<module name="IllegalToken"/>
<module name="IllegalTokenText"/>
<module name="IllegalType"/>
<module name="ModifiedControlVariable"/>
<module name="MultipleVariableDeclarations"/>
<module name="NoClone"/>
<module name="NoFinalizer"/>
<module name="OneStatementPerLine"/>
<module name="ParameterAssignment"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
<module name="UnnecessaryParentheses"/>
<module name="VariableDeclarationUsageDistance"/>

<!-- Imports -->
<module name="AvoidStarImport"/>
<module name="AvoidStaticImport">
<property name="excludes" value="java.util.Collections.emptyList"/>
<property name="excludes" value="org.mockito.Mockito.*"/>
<property name="excludes" value="rx.android.schedulers.AndroidSchedulers.*"/>
</module>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>

<!-- Miscellaneous -->
<module name="ArrayTypeStyle"/>
<module name="CommentsIndentation"/>
<module name="FinalParameters"/>
<module name="Indentation">
<property name="basicOffset" value="4"/>
<property name="arrayInitIndent" value="4"/>
<property name="caseIndent" value="4"/>
<property name="throwsIndent" value="4"/>
<property name="lineWrappingIndentation" value="4"/>
</module>

<!-- Modifiers -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>

<!-- Whitespace -->
<module name="EmptyForInitializerPad"/>
<module name="GenericWhitespace"/>
<module name="MethodParamPad"/>
<module name="NoLineWrap"/>
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="ParenPad"/>
<module name="SeparatorWrap">
<property name="option" value="nl"/>
<property name="tokens" value="DOT"/>
</module>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>

<module name="PackageName">
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
</module>

<module name="UpperEll" />
</module>

<module name="FileLength">
<property name="max" value="800"/>
</module>

<module name="FileTabCharacter"/>

<module name="NewlineAtEndOfFile"/>
</module>
6 changes: 4 additions & 2 deletions walle-cli/src/main/java/com/meituan/android/walle/commands/WriteChannelsCommand.java
View file
Expand Up @@ -55,8 +55,10 @@ public void parse() {
try {
final List<String> lines = IOUtils.readLines(new FileInputStream(channelFile), "UTF-8");
for (String line : lines) {
String lineTrim = line.trim();
if (lineTrim.length() == 0 || lineTrim.startsWith("#")) continue;
final String lineTrim = line.trim();
if (lineTrim.length() == 0 || lineTrim.startsWith("#")) {
continue;
}
final String channel = line.split("#")[0].trim();
if (channel.length() != 0) {
generateChannelApk(inputFile, outputDir, channel);
Expand Down

0 comments on commit b265004

Please sign in to comment.