Skip to content

Commit

Permalink
Update build tools and remove findbugs
Browse files Browse the repository at this point in the history
Because the findbugs plugin doesn't work with the new build
tools anymore.
  • Loading branch information
markusfisch committed Jun 7, 2020
1 parent 021a960 commit 98e366f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 38 deletions.
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,13 @@ debug:
lint:
./gradlew lintDebug

findbugs:
./gradlew findBugs

infer: clean
infer -- ./gradlew assembleDebug

release: lint findbugs
release: lint
./gradlew assembleRelease

bundle: lint findbugs
bundle: lint
./gradlew bundleRelease

install:
Expand Down
15 changes: 0 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: 'findbugs'

android {
compileSdkVersion sdk_version
Expand Down Expand Up @@ -35,17 +34,3 @@ android {
}
}
}

task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
excludeFilter = file('./findbugs-exclude.xml')
source = fileTree('src/main/java/')
classes = files("${project.rootDir}/app/build/intermediates/javac")
classpath = files()

effort = 'max'

reports {
xml.enabled = false
html.enabled = true
}
}
11 changes: 0 additions & 11 deletions app/findbugs-exclude.xml

This file was deleted.

8 changes: 3 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext.tools_version = '3.6.3'
ext.build_tools_version = '28.0.3'
ext.tools_version = '4.0.0'
ext.build_tools_version = '29.0.3'
ext.sdk_version = 29

repositories {
Expand All @@ -21,9 +21,7 @@ allprojects {

gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs \
<< "-Xlint:unchecked" \
<< "-Xlint:deprecation"
options.compilerArgs << "-Xlint:unchecked"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Feb 27 16:51:05 CET 2020
#Sun Jun 07 18:56:15 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

0 comments on commit 98e366f

Please sign in to comment.