Skip to content

Commit 895d13f

Browse files
committed
Merge branch 'release/3.6.0'
2 parents aef3955 + 42e2a8d commit 895d13f

File tree

7 files changed

+29
-28
lines changed

7 files changed

+29
-28
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ cache:
1919
android:
2020
components:
2121
- tools
22-
- build-tools-25.0.3
22+
- build-tools-27.0.3
2323
- platform-tools
2424
- extra-android-m2repository
2525
- extra-google-m2repository
2626
- extra-google-android-support
27-
- android-25
28-
- sys-img-armeabi-v7a-android-25
27+
- android-27
28+
- sys-img-armeabi-v7a-android-27
2929

3030
licenses:
3131
- 'android-sdk-preview-license-.+'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ buildscript {
2727
...
2828
dependencies {
2929
...
30-
classpath 'pt.simdea.verifier:verifier:3.5.9'
30+
classpath 'pt.simdea.verifier:verifier:3.6.0'
3131
...
3232
}
3333
...

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
13-
classpath 'pt.simdea.verifier:verifier:3.5.9-pre34'
12+
classpath 'com.android.tools.build:gradle:3.0.1'
13+
classpath 'pt.simdea.verifier:verifier:3.5.9'
1414
classpath 'com.novoda:bintray-release:0.5.0'
1515
}
1616
}

plugin/build.gradle

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@ repositories { jcenter() }
44

55
dependencies {
66
compileOnly gradleApi()
7+
78
// Checkstyle
8-
compile('com.puppycrawl.tools:checkstyle:8.2') {
9+
implementation('com.puppycrawl.tools:checkstyle:8.7') {
910
// Android Lint also depends on guava, so don't bring it in twice
1011
exclude module: 'guava'
1112
}
1213
// FindBugs
13-
compile 'com.google.code.findbugs:findbugs:3.0.1'
14+
implementation 'com.google.code.findbugs:findbugs:3.0.1'
1415
// SpotBugs
15-
//compile 'com.github.spotbugs:spotbugs:3.1.0-RC5'
16-
//compile 'com.github.spotbugs:spotbugs-ant:3.1.0-RC5'
17-
//compile 'com.github.spotbugs:spotbugs-annotations:3.1.0-RC5'
16+
//compile 'com.github.spotbugs:spotbugs:3.1.1'
17+
//compile 'com.github.spotbugs:spotbugs-ant:3.1.1'
18+
//compile 'com.github.spotbugs:spotbugs-annotations:3.1.1'
1819
//compile 'com.github.spotbugs:spotbugs-archetype:0.1.0'
1920
// PMD
20-
compile 'net.sourceforge.pmd:pmd-java:5.8.1'
21+
implementation 'net.sourceforge.pmd:pmd-java:6.0.1'
2122
// Error Prone
22-
compile 'com.google.errorprone:error_prone_ant:2.1.1'
23+
implementation 'com.google.errorprone:error_prone_ant:2.1.1'
2324
}
2425

2526
project.ext {
@@ -28,7 +29,7 @@ project.ext {
2829
description = 'Static code analysis plugin for Android projects.'
2930
groupId = 'pt.simdea.verifier'
3031
artifactId = 'verifier'
31-
version = "3.5.9"
32+
version = "3.6.0"
3233
website = 'https://github.com/simdea/android-quality-verifier'
3334
scm = 'https://github.com/simdea/android-quality-verifier'
3435
tags = ['android', 'verifier', 'check', 'checkstyle', 'spotbugs', 'pmd', 'lint', 'quality']

plugin/src/main/groovy/pt/simdea/verifier/CheckPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class CheckPlugin implements Plugin<Project> {
1515
target.check.extensions.create('lint', CheckExtension.Lint)
1616

1717
target.repositories.add(target.getRepositories().jcenter())
18-
target.dependencies.add("compile", "pt.simdea.verifier.annotations:verifier-annotations:0.0.3")
18+
target.dependencies.add("api", "pt.simdea.verifier.annotations:verifier-annotations:0.0.3")
1919
target.dependencies.add("annotationProcessor", "pt.simdea.verifier.annotations:verifier-annotations:0.0.3")
2020

2121
new FindbugsCheck().apply(target)

sample/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
22
apply plugin: 'pt.simdea.verifier'
33

44
android {
5-
compileSdkVersion 25
6-
buildToolsVersion '25.0.3'
5+
compileSdkVersion 27
6+
buildToolsVersion '27.0.3'
77

88
defaultConfig {
99
versionCode 1
1010
versionName '1.0'
1111
minSdkVersion 22
12-
targetSdkVersion 25
12+
targetSdkVersion 27
1313
}
1414

1515
compileOptions {
@@ -23,8 +23,8 @@ android {
2323
}
2424

2525
dependencies {
26-
compile 'org.slf4j:slf4j-api:1.7.12'
27-
compile ('com.github.tony19:logback-android-classic:1.1.1-4') {
26+
implementation 'org.slf4j:slf4j-api:1.7.12'
27+
implementation ('com.github.tony19:logback-android-classic:1.1.1-4') {
2828
exclude group: 'com.google.android'
2929
}
3030
}
@@ -37,15 +37,15 @@ check {
3737
abortOnError false
3838
}
3939

40-
/*findbugs {
40+
findbugs {
4141
abortOnError false
4242
reportXML new File(project.buildDir, 'reports/findbugs/findbugs.xml')
43-
}*/
43+
}
4444

45-
spotbugs {
45+
/*spotbugs {
4646
abortOnError false
4747
reportXML new File(project.buildDir, 'reports/spotbugs/spotbugs.xml')
48-
}
48+
}*/
4949

5050
pmd {
5151
abortOnError false

verifier-annotations/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.novoda.bintray-release'
33

44
android {
5-
compileSdkVersion 25
6-
buildToolsVersion "25.0.3"
5+
compileSdkVersion 27
6+
buildToolsVersion "27.0.3"
77

88
defaultConfig {
99
minSdkVersion 16
10-
targetSdkVersion 25
10+
targetSdkVersion 27
1111
versionCode 1
1212
versionName "1.0"
1313

@@ -23,7 +23,7 @@ android {
2323
}
2424

2525
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
26+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2727
}
2828

2929
project.ext {

0 commit comments

Comments
 (0)