diff --git a/build.gradle b/build.gradle
index 23fcc1a..fa3b777 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,8 @@ buildscript {
             minSdk             : 15,
             compileSdk         : 29,
             targetSdk          : 29,
-            kotlin             : '1.3.50',
-            androidGradlePlugin: '3.6.0-beta01',
+            kotlin             : '1.3.61',
+            androidGradlePlugin: '4.0.0-alpha06',
             versionsPlugin     : '0.25.0',
             hyperion           : '0.9.27',
             debugDb            : '1.0.6',
@@ -13,7 +13,8 @@ buildscript {
             deviceNames        : '1.1.9',
             autoService        : '1.0-rc6',
             shipkit            : '5406deb9d1746f963d1b132bccb3cca17021c3e9',
-            detekt             : '1.1.0'
+            detekt             : '1.1.0',
+            androidxAnnotations: '1.1.0'
     ]
 
     repositories {
@@ -35,7 +36,6 @@ buildscript {
 
 plugins {
     id 'io.gitlab.arturbosch.detekt' version "1.1.0"
-    id 'com.gradle.build-scan' version '2.4.2'
 }
 
 apply plugin: 'org.shipkit.java'
@@ -104,15 +104,6 @@ subprojects { subproject ->
 
         resourcePrefix 'foqa_'
 
-        libraryVariants.all {
-            // TODO replace with https://issuetracker.google.com/issues/72050365 once released.
-            generateBuildConfigProvider.configure {
-                enabled false
-            }
-        }
-        tasks.withType(JavaCompile) {
-            enabled false
-        }
         variantFilter {
             if (it.name == "debug") {
                 setIgnore(true)
diff --git a/font_scale_plugin/build.gradle b/font_scale_plugin/build.gradle
index 52089ba..90c745d 100644
--- a/font_scale_plugin/build.gradle
+++ b/font_scale_plugin/build.gradle
@@ -2,5 +2,5 @@ androidPublish.artifactId = 'fontscale'
 description = "Hyperion plugin for menu item with device and OS information. Part of FoQA project."
 
 dependencies {
-    implementation "com.jaredrummler:android-device-names:$versions.deviceNames"
+    compileOnly "androidx.annotation:annotation:$versions.androidxAnnotations"
 }
\ No newline at end of file
diff --git a/foqa/build.gradle b/foqa/build.gradle
index c905efd..add4d29 100644
--- a/foqa/build.gradle
+++ b/foqa/build.gradle
@@ -1,6 +1,12 @@
 androidPublish.artifactId = 'foqa'
 description = "Various Quality Assurance utilities to be included in QA/testing variants of Android apps"
 
+android {
+    defaultConfig {
+        consumerProguardFile 'consumer-progruard-rules.pro'
+    }
+}
+
 dependencies {
     api "com.willowtreeapps.hyperion:hyperion-core:$versions.hyperion"
     implementation "com.willowtreeapps.hyperion:hyperion-attr:$versions.hyperion"
diff --git a/foqa/consumer-progruard-rules.pro b/foqa/consumer-progruard-rules.pro
new file mode 100644
index 0000000..6c3fde6
--- /dev/null
+++ b/foqa/consumer-progruard-rules.pro
@@ -0,0 +1,3 @@
+ #TODO remove when https://github.com/amitshekhariitbhu/Android-Debug-Database/issues/174 is fixed
+-keep class com.amitshekhar.DebugDB**
+-keep class com.amitshekhar.model.** { *; }
diff --git a/gradle.properties b/gradle.properties
index a36dc54..1de82b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,3 +4,8 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=false
+android.defaults.buildfeatures.aidl=true
+android.defaults.buildfeatures.renderscript=true
+android.defaults.buildfeatures.resvalues=false
+android.defaults.buildfeatures.shaders=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..6d183c6 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7c4388a..51a7a0f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-milestone-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acf..2fe81a7 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/settings.gradle b/settings.gradle
index bee21b3..39d4b8e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,5 @@
-include ':foqa', ':device_info_plugin', ':font_scale_plugin', ':chucker_plugin', ':sample'
\ No newline at end of file
+plugins {
+    id 'com.gradle.enterprise' version '3.1.1'
+}
+
+include ':foqa', ':device_info_plugin', ':font_scale_plugin', ':chucker_plugin', ':sample'