Merge branch 'release/3.6.0'

Simdea · Jan 26, 2018 · 895d13f · 895d13f
2 parents aef3955 + 42e2a8d
commit 895d13f
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,13 +19,13 @@ cache:
 android:
   components:
     - tools
-    - build-tools-25.0.3
+    - build-tools-27.0.3
     - platform-tools
     - extra-android-m2repository
     - extra-google-m2repository
     - extra-google-android-support
-    - android-25
-    - sys-img-armeabi-v7a-android-25
+    - android-27
+    - sys-img-armeabi-v7a-android-27
 
 licenses:
   - 'android-sdk-preview-license-.+'

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ buildscript {
     ...
     dependencies {
         ...
-        classpath 'pt.simdea.verifier:verifier:3.5.9'
+        classpath 'pt.simdea.verifier:verifier:3.6.0'
         ...
     }
     ...

diff --git a/build.gradle b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
-        classpath 'pt.simdea.verifier:verifier:3.5.9-pre34'
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'pt.simdea.verifier:verifier:3.5.9'
         classpath 'com.novoda:bintray-release:0.5.0'
     }
 }

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -4,22 +4,23 @@ repositories { jcenter() }
 
 dependencies {
     compileOnly gradleApi()
+
     // Checkstyle
-    compile('com.puppycrawl.tools:checkstyle:8.2') {
+    implementation('com.puppycrawl.tools:checkstyle:8.7') {
         // Android Lint also depends on guava, so don't bring it in twice
         exclude module: 'guava'
     }
     // FindBugs
-    compile 'com.google.code.findbugs:findbugs:3.0.1'
+    implementation 'com.google.code.findbugs:findbugs:3.0.1'
     // SpotBugs
-    //compile 'com.github.spotbugs:spotbugs:3.1.0-RC5'
-    //compile 'com.github.spotbugs:spotbugs-ant:3.1.0-RC5'
-    //compile 'com.github.spotbugs:spotbugs-annotations:3.1.0-RC5'
+    //compile 'com.github.spotbugs:spotbugs:3.1.1'
+    //compile 'com.github.spotbugs:spotbugs-ant:3.1.1'
+    //compile 'com.github.spotbugs:spotbugs-annotations:3.1.1'
     //compile 'com.github.spotbugs:spotbugs-archetype:0.1.0'
     // PMD
-    compile 'net.sourceforge.pmd:pmd-java:5.8.1'
+    implementation 'net.sourceforge.pmd:pmd-java:6.0.1'
     // Error Prone
-    compile 'com.google.errorprone:error_prone_ant:2.1.1'
+    implementation 'com.google.errorprone:error_prone_ant:2.1.1'
 }
 
 project.ext {
@@ -28,7 +29,7 @@ project.ext {
     description = 'Static code analysis plugin for Android projects.'
     groupId = 'pt.simdea.verifier'
     artifactId = 'verifier'
-    version = "3.5.9"
+    version = "3.6.0"
     website = 'https://github.com/simdea/android-quality-verifier'
     scm = 'https://github.com/simdea/android-quality-verifier'
     tags = ['android', 'verifier', 'check', 'checkstyle', 'spotbugs', 'pmd', 'lint', 'quality']

diff --git a/plugin/src/main/groovy/pt/simdea/verifier/CheckPlugin.groovy b/plugin/src/main/groovy/pt/simdea/verifier/CheckPlugin.groovy
@@ -15,7 +15,7 @@ class CheckPlugin implements Plugin<Project> {
         target.check.extensions.create('lint', CheckExtension.Lint)
 
         target.repositories.add(target.getRepositories().jcenter())
-        target.dependencies.add("compile", "pt.simdea.verifier.annotations:verifier-annotations:0.0.3")
+        target.dependencies.add("api", "pt.simdea.verifier.annotations:verifier-annotations:0.0.3")
         target.dependencies.add("annotationProcessor", "pt.simdea.verifier.annotations:verifier-annotations:0.0.3")
 
         new FindbugsCheck().apply(target)

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'pt.simdea.verifier'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         versionCode 1
         versionName '1.0'
         minSdkVersion 22
-        targetSdkVersion 25
+        targetSdkVersion 27
     }
 
     compileOptions {
@@ -23,8 +23,8 @@ android {
 }
 
 dependencies {
-    compile 'org.slf4j:slf4j-api:1.7.12'
-    compile ('com.github.tony19:logback-android-classic:1.1.1-4')  {
+    implementation 'org.slf4j:slf4j-api:1.7.12'
+    implementation ('com.github.tony19:logback-android-classic:1.1.1-4')  {
         exclude group: 'com.google.android'
     }
 }
@@ -37,15 +37,15 @@ check {
         abortOnError false
     }
 
-    /*findbugs {
+    findbugs {
         abortOnError false
         reportXML new File(project.buildDir, 'reports/findbugs/findbugs.xml')
-    }*/
+    }
 
-    spotbugs {
+    /*spotbugs {
         abortOnError false
         reportXML new File(project.buildDir, 'reports/spotbugs/spotbugs.xml')
-    }
+    }*/
 
     pmd {
         abortOnError false

diff --git a/verifier-annotations/build.gradle b/verifier-annotations/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
 
@@ -23,7 +23,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 project.ext {