diff --git a/.travis.yml b/.travis.yml
index 6b9dd73..5a55688 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,7 @@ install:
 - echo y | android update sdk -u -a -t extra-google-m2repository
 - echo y | android update sdk -u -a -t extra-android-m2repository
 
-script: ./gradlew assembleRelease testReleaseUnitTest lintRelease findbugs
+script: ./gradlew assembleRelease testReleaseUnitTest lintRelease
 
 after_failure:
-- cat app/build/reports/findbugs/findbugs.html
 - cat app/build/reports/tests/debug/index.html
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ec3599..f96460f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,14 +16,11 @@ can be run by gradle using:
 
     # ./gradlew testReleaseUnitTest
 
-The second and third check for common problems using static analysis.
-These are the Android lint checker, run using:
+The second check for common problems uses static analysis.
+This is the Android lint checker, run using:
 
     # ./gradlew lintRelease
 
-and FindBugs, run using:
-
-    # ./gradlew findbugs
 
 The final check is by testing the application on a live device and verifying
 the basic functionality works as expected.
diff --git a/app/build.gradle b/app/build.gradle
index b0839a9..445a8b4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,10 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'findbugs'
-
-findbugs {
-    sourceSets = []
-    ignoreFailures = false
-}
 
 android {
     compileSdkVersion 26
@@ -12,9 +6,10 @@ android {
     defaultConfig {
         applicationId "de.rochefort.childmonitor"
         minSdkVersion 21
+        //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 26
         versionCode 5
-        versionName "0.5"
+        versionName "1.0"
     }
 
     buildTypes {
@@ -24,26 +19,12 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
+
     dependencies {
         compile "com.android.support:support-compat:26.1.0"
     }
-}
-
-task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
-
-    description 'Run findbugs'
-    group 'verification'
-
-    classes = fileTree('build/intermediates/classes/debug/')
-    source = fileTree('src/main/java')
-    classpath = files()
-
-    effort = 'max'
-
-    excludeFilter = file("./config/findbugs/exclude.xml")
-
-    reports {
-        xml.enabled = false
-        html.enabled = true
-    }
-}
+}
\ No newline at end of file
diff --git a/app/config/findbugs/exclude.xml b/app/config/findbugs/exclude.xml
deleted file mode 100644
index 8f7997b..0000000
--- a/app/config/findbugs/exclude.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<FindBugsFilter>
-
-    <Match>
-        <Class name="~.*R\$.*"/>
-    </Match>
-    <Match>
-        <Class name="~.*Manifest\$.*"/>
-    </Match>
-
-</FindBugsFilter>
diff --git a/build.gradle b/build.gradle
index dd25646..ce5b723 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 2b0e3c8..d9a917e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,3 @@
 # The aapt2 tool creates an APK which fails to install on Android 5 and below if it contains
 # a bug. Build tools 27.0.1 has a mitigation. Avoiding aapt2 also avoids hitting the bug.
 # See: https://issuetracker.google.com/issues/64434571
-android.enableAapt2=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7937cf5..6034e39 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ 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
-distributionSha256Sum=abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb