Skip to content

Commit

Permalink
Update Gradle and tools (#300)
Browse files Browse the repository at this point in the history
* Update gradle and tools

* Bump bintray-release version for compatibility with Gradle 5

* Update Travis build tools

* Remove findbugs completely

* Remove pmd completely
  • Loading branch information
Sloy authored May 17, 2019
1 parent ae036f9 commit 514b1a0
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 1,149 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android:
- tools
- tools
- platform-tools
- build-tools-27.0.3
- build-tools-28.0.3
- android-28
- extra
- addon
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.2.50'
ext.kotlin_version = '1.3.31'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.novoda:bintray-release:0.8.1'
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.novoda:bintray-release:0.9.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
44 changes: 1 addition & 43 deletions config/android-quality.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
apply plugin: 'pmd'
apply plugin: 'findbugs'
apply plugin: 'checkstyle'

def isTravis = "true".equals(System.getenv("TRAVIS"))

pmd {
ruleSetFiles = files("${project.rootDir}/config/pmd/pmd-ruleset.xml")
}

findbugs {
includeFilter = file("${project.rootDir}/config/findbugs/findbugs-config.xml")
excludeFilter = file("${project.rootDir}/config/findbugs/findbugs-excludes.xml")
}

checkstyle {
toolVersion = "7.1.1"
showViolations isTravis
Expand All @@ -25,37 +14,6 @@ android.lintOptions {
textOutput 'stdout'
}

task pmd(type: Pmd) {
description 'Run pmd'
group 'verification'

source = fileTree('src/main/java')
consoleOutput = isTravis
ignoreFailures = false

reports {
xml.enabled = false
html.enabled = !isTravis
}
}

task findbugs(type: FindBugs, dependsOn: assemble) {
description 'Run findbugs'
group 'verification'

classes = fileTree('build/intermediates/classes/')
source = fileTree('src/main/java/')
classpath = files()
includeFilter = file("$rootProject.projectDir/config/findbugs/findbugs-config.xml")
excludeFilter = file("$rootProject.projectDir/config/findbugs/findbugs-excludes.xml")
ignoreFailures = false

reports {
xml.enabled = false
html.enabled = true
}
}

task checkstyle(type: Checkstyle) {
description 'Run checkstyle'
group 'verification'
Expand All @@ -68,7 +26,7 @@ task checkstyle(type: Checkstyle) {
classpath = files()
}

check.dependsOn 'checkstyle', 'findbugs', 'pmd', 'lint'
check.dependsOn 'checkstyle', 'lint'

apply plugin: 'jacoco'

Expand Down
Loading

0 comments on commit 514b1a0

Please sign in to comment.