Skip to content

Commit a481ddc

Browse files
committed
Merge pull request #5 from ppamorim/master
Checkstyle fix
2 parents 6f78a9d + be68a21 commit a481ddc

File tree

4 files changed

+49
-9
lines changed

4 files changed

+49
-9
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# ProgressLayout
22
Custom Progress Layout for Android
33

4+
[![Build Status](https://api.travis-ci.org/iammert/ProgressLayout.svg)](https://travis-ci.org/iammert/ProgressLayout)
45
[![Join the chat at https://gitter.im/iammert/ProgressLayout](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/iammert/ProgressLayout)
56

67
[Here is the youtube link](https://www.youtube.com/watch?v=emDViR9g5H4)

app/build.gradle

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.application'
2+
apply plugin: 'checkstyle'
23

34
dependencies {
45
compile project(':library')
@@ -28,6 +29,24 @@ android {
2829
}
2930
}
3031

32+
packagingOptions {
33+
exclude 'META-INF/DEPENDENCIES.txt'
34+
exclude 'META-INF/LICENSE.txt'
35+
exclude 'META-INF/NOTICE.txt'
36+
exclude 'META-INF/NOTICE'
37+
exclude 'META-INF/LICENSE'
38+
exclude 'META-INF/DEPENDENCIES'
39+
exclude 'META-INF/notice.txt'
40+
exclude 'META-INF/license.txt'
41+
exclude 'META-INF/dependencies.txt'
42+
exclude 'META-INF/LGPL2.1'
43+
exclude 'META-INF/services/javax.annotation.processing.Processor'
44+
}
45+
46+
lintOptions {
47+
abortOnError false
48+
}
49+
3150
}
3251

3352
task checkstyle(type: Checkstyle) {

build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
buildscript {
2-
repositories {
3-
jcenter()
4-
}
5-
dependencies {
6-
classpath 'com.android.tools.build:gradle:1.3.0'
7-
}
2+
repositories {
3+
jcenter()
4+
}
5+
dependencies {
6+
classpath 'com.android.tools.build:gradle:1.3.0'
7+
classpath "com.github.dcendents:android-maven-gradle-plugin:1.3"
8+
}
89
}
910

1011
allprojects {
11-
repositories {
12-
jcenter()
13-
}
12+
repositories {
13+
jcenter()
14+
}
1415
}

library/build.gradle

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.library'
2+
apply plugin: 'checkstyle'
23

34
android {
45

@@ -20,6 +21,24 @@ android {
2021
}
2122
}
2223

24+
packagingOptions {
25+
exclude 'META-INF/DEPENDENCIES.txt'
26+
exclude 'META-INF/LICENSE.txt'
27+
exclude 'META-INF/NOTICE.txt'
28+
exclude 'META-INF/NOTICE'
29+
exclude 'META-INF/LICENSE'
30+
exclude 'META-INF/DEPENDENCIES'
31+
exclude 'META-INF/notice.txt'
32+
exclude 'META-INF/license.txt'
33+
exclude 'META-INF/dependencies.txt'
34+
exclude 'META-INF/LGPL2.1'
35+
exclude 'META-INF/services/javax.annotation.processing.Processor'
36+
}
37+
38+
lintOptions {
39+
abortOnError false
40+
}
41+
2342
}
2443

2544
task checkstyle(type: Checkstyle) {

0 commit comments

Comments
 (0)