diff --git a/another-app/proguard-rules.pro b/another-app/proguard-rules.pro
index 5feb44ce8..08a6030f1 100644
--- a/another-app/proguard-rules.pro
+++ b/another-app/proguard-rules.pro
@@ -3,6 +3,9 @@
 # removes such information by default, so configure it to keep all of it.
 -keepattributes Signature
 
+#Required from R8 in newer versions of Gradle
+-keepattributes EnclosingMethod
+
 # For using GSON @Expose annotation
 -keepattributes *Annotation*
 
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index fe414f963..5010a0f22 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -58,7 +58,6 @@ dependencies {
     implementation deps.build.rockerRuntime
     implementation deps.external.guava
     implementation deps.external.gson
-    implementation deps.lint.lintGradle
 
     testImplementation deps.test.junit
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index 6fd7016aa..6e8f87bf7 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,8 +17,8 @@ def exclude = { dep, String... excludes  ->
 }
 
 def versions = [
-        androidPlugin      : "4.1.0",
-        androidTools       : "27.1.0",
+        androidPlugin      : "4.2.2",
+        androidTools       : "30.0.2",
         autovalue          : "1.7.4",
         avro               : "1.10.1",
         butterKnife        : "10.2.3",
@@ -34,6 +34,7 @@ def versions = [
 ]
 
 def build = [
+        androidCommon    : "com.android.tools:common:${versions.androidTools}",
         androidPlugin    : "com.android.tools.build:gradle:${versions.androidPlugin}",
         androidPluginApi : "com.android.tools.build:gradle-api:${versions.androidPlugin}",
         bcprov           : "org.bouncycastle:bcprov-jdk15on:1.60",
@@ -60,7 +61,7 @@ def build = [
 ]
 
 def buildConfig = [
-        buildTools: "30.0.3",
+        buildTools: "30.0.2",
         compileSdk: 30,
         minSdk    : 21,
         targetSdk : 30,
diff --git a/gradle.properties b/gradle.properties
index 646c51b97..7c88e7b7e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,3 @@
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
diff --git a/kotlin-app/build.gradle b/kotlin-app/build.gradle
index ab9d98fd7..bfbc4b998 100644
--- a/kotlin-app/build.gradle
+++ b/kotlin-app/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     compileOnly deps.external.annotationApi
 
     kaptTest deps.apt.daggerCompiler
+    kaptTest deps.apt.daggerAndroidProcessor
 
     testCompileOnly deps.external.annotationApi
     androidTestCompileOnly deps.external.annotationApi
diff --git a/libraries/emptylibrary/build.gradle b/libraries/emptylibrary/build.gradle
index 56d177f86..1c81418d5 100644
--- a/libraries/emptylibrary/build.gradle
+++ b/libraries/emptylibrary/build.gradle
@@ -4,6 +4,11 @@ android {
     lintOptions {
         disable "HardcodedDebugMode"
     }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/manifest-merger-cli/build.gradle b/manifest-merger-cli/build.gradle
index ce56bfca2..13a3b3dfe 100644
--- a/manifest-merger-cli/build.gradle
+++ b/manifest-merger-cli/build.gradle
@@ -22,6 +22,7 @@ mainClassName = "com.uber.okbuck.manifmerger.ManifestMergerCli"
 
 dependencies {
     compileOnly deps.build.manifestMerger
+    compileOnly deps.build.androidCommon
 }
 
 File copyTo = project(pluginProjectPath).file("src/main/resources/com/uber/okbuck/core/util/manifest/")
diff --git a/transform-cli/src/main/java/com/uber/okbuck/transform/TransformInvocationBuilder.java b/transform-cli/src/main/java/com/uber/okbuck/transform/TransformInvocationBuilder.java
index 095f283f1..1f46b4f09 100644
--- a/transform-cli/src/main/java/com/uber/okbuck/transform/TransformInvocationBuilder.java
+++ b/transform-cli/src/main/java/com/uber/okbuck/transform/TransformInvocationBuilder.java
@@ -132,6 +132,11 @@ public String getPath() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public String getProjectName() {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
     public String getVariantName() {
       throw new UnsupportedOperationException();