Update Android SDK and build tools to 30 along with AGP to 4.1.1. AGP also requires newer Gradle version, so bumping the wrapper to 6.7. Robolectric also had tro be updates to 4.5-alpha which supports API 30.

RELNOTES=N/A
PiperOrigin-RevId: 347443545

45 files changed, 107 insertions, 107 deletions

diff --git a/.travis.yml b/.travis.yml
index 9a50a19df..32e005f4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,13 +18,13 @@ jdk:
 android:
   components:
     - tools
-    - tools # Duplicated as per https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
-    - build-tools-29.0.2
-    - android-29
     - platform-tools
+    - tools # Duplicated as per https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
     - extra-android-m2repository
 
 before_install:
+  - yes | sdkmanager "build-tools;30.0.2"
+  - yes | sdkmanager "platforms;android-30"
   - wget https://github.com/bazelbuild/bazel/releases/download/"${BAZEL_VERSION}"/bazel_"${BAZEL_VERSION}"-linux-x86_64.deb
   - sudo dpkg -i bazel_"${BAZEL_VERSION}"-linux-x86_64.deb
   - sudo rm -f /etc/mavenrc
diff --git a/BUILD b/BUILD
index 6ed46a9ea..21d932a00 100644
--- a/BUILD
+++ b/BUILD
@@ -95,7 +95,7 @@ javadoc_library(
         "//java/dagger/producers:producers-srcs",
         "//java/dagger/spi:spi-srcs",
     ],
-    android_api_level = 29,
+    android_api_level = 30,
     # TODO(ronshapiro): figure out how to specify the version number for release builds
     doctitle = "Dagger Dependency Injection API",
     exclude_packages = [
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4ea59c476..54fb50aa9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,9 +40,9 @@ Dagger is built with [`bazel`](https://bazel.build).
             [download](https://developer.android.com/studio#command-tools)
             and unzip it first.
         *   Install the necessary components. For example, under Linux, run:
-            `$ANDROID_HOME/tools/bin/sdkmanager "platforms;android-29" "build-tools;29.0.2"`
+            `$ANDROID_HOME/tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.2"`
             *   If you skip this step, you will see an error similar to
-                `ERROR: missing input file '@androidsdk//:build-tools/29.0.2/aapt'`.
+                `ERROR: missing input file '@androidsdk//:build-tools/30.0.2/aapt'`.
             *   You may also need to run `bazel sync`.
 *   Run tests with `bazel test <target>`, or `bazel test //...` to run all
     tests.
diff --git a/WORKSPACE b/WORKSPACE
index c768bbb39..5d82d644e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -23,9 +23,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "google_bazel_common",
-    sha256 = "7e5584a1527390d55c972c246471cffd4c68b4c234d288f6afb52af8619c4560",
-    strip_prefix = "bazel-common-d58641d120c2ad3d0afd77b57fbaa78f3a97d914",
-    urls = ["https://github.com/google/bazel-common/archive/d58641d120c2ad3d0afd77b57fbaa78f3a97d914.zip"],
+    sha256 = "d1d34f45d8ec981fcb70cfbf0894fa907c929f2015411b022fbfa35696daa3b2",
+    strip_prefix = "bazel-common-cc78f7808ab3d0641fc3e012a9ef6d0bec516d07",
+    urls = ["https://github.com/google/bazel-common/archive/cc78f7808ab3d0641fc3e012a9ef6d0bec516d07.zip"],
 )
 
 load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")
diff --git a/examples/bazel/WORKSPACE b/examples/bazel/WORKSPACE
index c97232579..23f93b11c 100644
--- a/examples/bazel/WORKSPACE
+++ b/examples/bazel/WORKSPACE
@@ -39,8 +39,8 @@ load(
 
 android_sdk_repository(
     name = "androidsdk",
-    api_level = 29,
-    build_tools_version = "29.0.2",
+    api_level = 30,
+    build_tools_version = "30.0.2",
 )
 
 #############################
diff --git a/java/dagger/android/BUILD b/java/dagger/android/BUILD
index 6a1428089..f0cea4149 100644
--- a/java/dagger/android/BUILD
+++ b/java/dagger/android/BUILD
@@ -104,7 +104,7 @@ pom_file(
 javadoc_library(
     name = "android-javadoc",
     srcs = [":android-srcs"],
-    android_api_level = 29,
+    android_api_level = 30,
     exclude_packages = ["dagger.android.internal"],
     root_packages = ["dagger.android"],
     deps = [":android"],
diff --git a/java/dagger/android/support/BUILD b/java/dagger/android/support/BUILD
index fd6c32bf6..03846b577 100644
--- a/java/dagger/android/support/BUILD
+++ b/java/dagger/android/support/BUILD
@@ -85,7 +85,7 @@ pom_file(
 javadoc_library(
     name = "support-javadoc",
     srcs = [":support-srcs"],
-    android_api_level = 29,
+    android_api_level = 30,
     root_packages = ["dagger.android.support"],
     deps = [":support"],
 )
diff --git a/java/dagger/example/gradle/android/simple/app/build.gradle b/java/dagger/example/gradle/android/simple/app/build.gradle
index 0b1203e55..d8f6346cb 100644
--- a/java/dagger/example/gradle/android/simple/app/build.gradle
+++ b/java/dagger/example/gradle/android/simple/app/build.gradle
@@ -17,20 +17,20 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "dagger.example.gradle.android.simple"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
 }
 
 dependencies {
-  implementation 'androidx.appcompat:appcompat:1.1.0'
+  implementation 'androidx.appcompat:appcompat:1.2.0'
   implementation 'com.google.dagger:dagger:LOCAL-SNAPSHOT'
   implementation 'com.google.dagger:dagger-android-support:LOCAL-SNAPSHOT'
   annotationProcessor 'com.google.dagger:dagger-compiler:LOCAL-SNAPSHOT'
diff --git a/java/dagger/example/gradle/android/simple/app/src/main/AndroidManifest.xml b/java/dagger/example/gradle/android/simple/app/src/main/AndroidManifest.xml
index e8d9fdbe9..cc666d2f2 100644
--- a/java/dagger/example/gradle/android/simple/app/src/main/AndroidManifest.xml
+++ b/java/dagger/example/gradle/android/simple/app/src/main/AndroidManifest.xml
@@ -16,10 +16,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="dagger.example.gradle.android.simple">
 
-  <uses-sdk
-    android:minSdkVersion="14"
-    android:targetSdkVersion="28"/>
-
   <application
     android:name=".SimpleApplication"
     android:label="@string/appName"
diff --git a/java/dagger/example/gradle/android/simple/build.gradle b/java/dagger/example/gradle/android/simple/build.gradle
index 9b36aa9cc..50f8f0baa 100644
--- a/java/dagger/example/gradle/android/simple/build.gradle
+++ b/java/dagger/example/gradle/android/simple/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 
diff --git a/java/dagger/example/gradle/android/simple/gradle.properties b/java/dagger/example/gradle/android/simple/gradle.properties
new file mode 100644
index 000000000..2d8d1e4dd
--- /dev/null
+++ b/java/dagger/example/gradle/android/simple/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
\ No newline at end of file
diff --git a/java/dagger/example/gradle/android/simple/gradle/wrapper/gradle-wrapper.properties b/java/dagger/example/gradle/android/simple/gradle/wrapper/gradle-wrapper.properties
index f4d7b2bf6..be52383ef 100644
--- a/java/dagger/example/gradle/android/simple/gradle/wrapper/gradle-wrapper.properties
+++ b/java/dagger/example/gradle/android/simple/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties b/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties
index f4d7b2bf6..be52383ef 100644
--- a/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties
+++ b/java/dagger/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java/dagger/hilt/android/BUILD b/java/dagger/hilt/android/BUILD
index ba531dd35..5a58e3b3a 100644
--- a/java/dagger/hilt/android/BUILD
+++ b/java/dagger/hilt/android/BUILD
@@ -169,7 +169,7 @@ gen_maven_artifact(
         "com.google.guava:guava",
         "javax.annotation:jsr250-api",
     ],
-    javadoc_android_api_level = 29,
+    javadoc_android_api_level = 30,
     javadoc_exclude_packages = [
         "dagger.hilt.android.internal",
     ],
diff --git a/java/dagger/hilt/android/example/gradle/simple/app/build.gradle b/java/dagger/hilt/android/example/gradle/simple/app/build.gradle
index 5e4458a51..71e225e32 100644
--- a/java/dagger/hilt/android/example/gradle/simple/app/build.gradle
+++ b/java/dagger/hilt/android/example/gradle/simple/app/build.gradle
@@ -18,13 +18,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'dagger.hilt.android.plugin'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "dagger.hilt.android.example.gradle.simple"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "dagger.hilt.android.example.gradle.simple.SimpleEmulatorTestRunner"
@@ -53,23 +53,23 @@ hilt {
 
 dependencies {
   implementation project(':feature')
-  implementation 'androidx.appcompat:appcompat:1.1.0'
+  implementation 'androidx.appcompat:appcompat:1.2.0'
   implementation 'com.google.dagger:hilt-android:LOCAL-SNAPSHOT'
   annotationProcessor 'com.google.dagger:hilt-android-compiler:LOCAL-SNAPSHOT'
 
   testImplementation 'com.google.truth:truth:1.0.1'
   testImplementation 'junit:junit:4.13'
-  testImplementation 'org.robolectric:robolectric:4.3.1'
-  testImplementation 'androidx.core:core:1.2.0'
-  testImplementation 'androidx.test.ext:junit:1.1.1'
-  testImplementation 'androidx.test:runner:1.2.0'
+  testImplementation 'org.robolectric:robolectric:4.5-alpha-3'
+  testImplementation 'androidx.core:core:1.3.2'
+  testImplementation 'androidx.test.ext:junit:1.1.2'
+  testImplementation 'androidx.test:runner:1.3.0'
   testImplementation 'com.google.dagger:hilt-android-testing:LOCAL-SNAPSHOT'
   testAnnotationProcessor 'com.google.dagger:hilt-android-compiler:LOCAL-SNAPSHOT'
 
   androidTestImplementation 'com.google.truth:truth:1.0.1'
   androidTestImplementation 'junit:junit:4.13'
-  androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-  androidTestImplementation 'androidx.test:runner:1.2.0'
+  androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+  androidTestImplementation 'androidx.test:runner:1.3.0'
   androidTestImplementation 'com.google.dagger:hilt-android-testing:LOCAL-SNAPSHOT'
   androidTestAnnotationProcessor 'com.google.dagger:hilt-android-compiler:LOCAL-SNAPSHOT'
 
diff --git a/java/dagger/hilt/android/example/gradle/simple/build.gradle b/java/dagger/hilt/android/example/gradle/simple/build.gradle
index cb6d02a85..46342ed1d 100644
--- a/java/dagger/hilt/android/example/gradle/simple/build.gradle
+++ b/java/dagger/hilt/android/example/gradle/simple/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext {
         kotlin_version = '1.3.61'
-        agp_version = System.getenv('AGP_VERSION') ?: "3.6.3"
+        agp_version = System.getenv('AGP_VERSION') ?: "4.1.1"
     }
     repositories {
         google()
diff --git a/java/dagger/hilt/android/example/gradle/simple/feature/build.gradle b/java/dagger/hilt/android/example/gradle/simple/feature/build.gradle
index 0f67718b5..70fa1ea30 100644
--- a/java/dagger/hilt/android/example/gradle/simple/feature/build.gradle
+++ b/java/dagger/hilt/android/example/gradle/simple/feature/build.gradle
@@ -20,12 +20,12 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -48,7 +48,7 @@ dependencies {
     // by the app need to expose @kotlin.Metadata
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.dagger:hilt-android:LOCAL-SNAPSHOT'
     kapt 'com.google.dagger:hilt-android-compiler:LOCAL-SNAPSHOT'
 }
diff --git a/java/dagger/hilt/android/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties b/java/dagger/hilt/android/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties
index a4b442974..be52383ef 100644
--- a/java/dagger/hilt/android/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties
+++ b/java/dagger/hilt/android/example/gradle/simple/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java/dagger/hilt/android/example/gradle/simpleKotlin/app/build.gradle b/java/dagger/hilt/android/example/gradle/simpleKotlin/app/build.gradle
index 9e98ec793..5fc1923e3 100644
--- a/java/dagger/hilt/android/example/gradle/simpleKotlin/app/build.gradle
+++ b/java/dagger/hilt/android/example/gradle/simpleKotlin/app/build.gradle
@@ -20,13 +20,13 @@ apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "dagger.hilt.android.example.gradle.simpleKotlin"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -46,15 +46,15 @@ hilt {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 
     implementation 'com.google.dagger:hilt-android:LOCAL-SNAPSHOT'
     kapt 'com.google.dagger:hilt-android-compiler:LOCAL-SNAPSHOT'
 
     testImplementation 'com.google.truth:truth:1.0.1'
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
-    testImplementation 'androidx.core:core:1.1.0'
+    testImplementation 'org.robolectric:robolectric:4.5-alpha-3'
+    testImplementation 'androidx.core:core:1.3.2'
     // TODO(bcorso): This multidex dep shouldn't be required -- it's a dep for the generated code.
     testImplementation 'androidx.multidex:multidex:2.0.0'
     testImplementation 'com.google.dagger:hilt-android-testing:LOCAL-SNAPSHOT'
diff --git a/java/dagger/hilt/android/example/gradle/simpleKotlin/build.gradle b/java/dagger/hilt/android/example/gradle/simpleKotlin/build.gradle
index e1edb8d93..17f228968 100644
--- a/java/dagger/hilt/android/example/gradle/simpleKotlin/build.gradle
+++ b/java/dagger/hilt/android/example/gradle/simpleKotlin/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext {
         kotlin_version = '1.3.61'
-        agp_version = System.getenv('AGP_VERSION') ?: "3.6.3"
+        agp_version = System.getenv('AGP_VERSION') ?: "4.1.1"
     }
     repositories {
         google()
diff --git a/java/dagger/hilt/android/example/gradle/simpleKotlin/gradle/wrapper/gradle-wrapper.properties b/java/dagger/hilt/android/example/gradle/simpleKotlin/gradle/wrapper/gradle-wrapper.properties
index a4b442974..be52383ef 100644
--- a/java/dagger/hilt/android/example/gradle/simpleKotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/java/dagger/hilt/android/example/gradle/simpleKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java/dagger/hilt/android/plugin/gradle/wrapper/gradle-wrapper.properties b/java/dagger/hilt/android/plugin/gradle/wrapper/gradle-wrapper.properties
index a4b442974..be52383ef 100644
--- a/java/dagger/hilt/android/plugin/gradle/wrapper/gradle-wrapper.properties
+++ b/java/dagger/hilt/android/plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java/dagger/hilt/android/processor/BUILD b/java/dagger/hilt/android/processor/BUILD
index 8926c1721..1fabdb727 100644
--- a/java/dagger/hilt/android/processor/BUILD
+++ b/java/dagger/hilt/android/processor/BUILD
@@ -83,7 +83,7 @@ gen_maven_artifact(
         "org.jetbrains.kotlin:kotlin-stdlib",
         "org.jetbrains.kotlinx:kotlinx-metadata-jvm",
     ],
-    javadoc_android_api_level = 29,
+    javadoc_android_api_level = 30,
     javadoc_root_packages = [
         "dagger.hilt.processor",
         "dagger.hilt.android.processor",
diff --git a/java/dagger/hilt/android/testing/BUILD b/java/dagger/hilt/android/testing/BUILD
index 3a28d168e..b7fca1b67 100644
--- a/java/dagger/hilt/android/testing/BUILD
+++ b/java/dagger/hilt/android/testing/BUILD
@@ -212,7 +212,7 @@ gen_maven_artifact(
         "com.google.guava:guava",
         "javax.annotation:jsr250-api",
     ],
-    javadoc_android_api_level = 29,
+    javadoc_android_api_level = 30,
     javadoc_exclude_packages = [
         "dagger.hilt.internal",
         "dagger.hilt.android.internal",
diff --git a/java/dagger/hilt/processor/BUILD b/java/dagger/hilt/processor/BUILD
index 521327164..897fa0509 100644
--- a/java/dagger/hilt/processor/BUILD
+++ b/java/dagger/hilt/processor/BUILD
@@ -102,7 +102,7 @@ gen_maven_artifact(
         "org.jetbrains.kotlin:kotlin-stdlib",
         "org.jetbrains.kotlinx:kotlinx-metadata-jvm",
     ],
-    javadoc_android_api_level = 29,
+    javadoc_android_api_level = 30,
     javadoc_root_packages = [
         "dagger.hilt.processor",
         "dagger.hilt.android.processor",
diff --git a/javatests/artifacts/dagger-android/simple/app/build.gradle b/javatests/artifacts/dagger-android/simple/app/build.gradle
index fc29e98fb..20a37340e 100644
--- a/javatests/artifacts/dagger-android/simple/app/build.gradle
+++ b/javatests/artifacts/dagger-android/simple/app/build.gradle
@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "dagger.android.simple"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -46,25 +46,25 @@ android {
 }
 
 dependencies {
-  implementation 'androidx.appcompat:appcompat:1.1.0'
+  implementation 'androidx.appcompat:appcompat:1.2.0'
   implementation 'com.google.dagger:dagger:LOCAL-SNAPSHOT'
   implementation 'com.google.dagger:dagger-android-support:LOCAL-SNAPSHOT'
   annotationProcessor 'com.google.dagger:dagger-compiler:LOCAL-SNAPSHOT'
   annotationProcessor 'com.google.dagger:dagger-android-processor:LOCAL-SNAPSHOT'
 
   testImplementation 'com.google.truth:truth:1.0.1'
-  testImplementation 'org.robolectric:robolectric:4.3.1'
-  testImplementation 'androidx.core:core:1.2.0'
-  testImplementation 'androidx.test.ext:junit:1.1.1'
-  testImplementation 'androidx.test:runner:1.2.0'
-  testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+  testImplementation 'org.robolectric:robolectric:4.5-alpha-3'
+  testImplementation 'androidx.core:core:1.3.2'
+  testImplementation 'androidx.test.ext:junit:1.1.2'
+  testImplementation 'androidx.test:runner:1.3.0'
+  testImplementation 'androidx.test.espresso:espresso-core:3.3.0'
   testImplementation 'com.google.dagger:dagger-compiler:LOCAL-SNAPSHOT'
   testAnnotationProcessor 'com.google.dagger:dagger-android-processor:LOCAL-SNAPSHOT'
 
   androidTestImplementation 'com.google.truth:truth:1.0.1'
-  androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-  androidTestImplementation 'androidx.test:runner:1.2.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+  androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+  androidTestImplementation 'androidx.test:runner:1.3.0'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
   androidTestImplementation 'com.google.dagger:dagger-compiler:LOCAL-SNAPSHOT'
   androidTestAnnotationProcessor 'com.google.dagger:dagger-android-processor:LOCAL-SNAPSHOT'
 
diff --git a/javatests/artifacts/dagger-android/simple/app/src/main/AndroidManifest.xml b/javatests/artifacts/dagger-android/simple/app/src/main/AndroidManifest.xml
index 354132a06..0f765b521 100644
--- a/javatests/artifacts/dagger-android/simple/app/src/main/AndroidManifest.xml
+++ b/javatests/artifacts/dagger-android/simple/app/src/main/AndroidManifest.xml
@@ -16,10 +16,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="dagger.android.simple">
 
-  <uses-sdk
-    android:minSdkVersion="14"
-    android:targetSdkVersion="28"/>
-
   <application
     android:name=".SimpleApplication"
     android:label="@string/appName"
diff --git a/javatests/artifacts/dagger-android/simple/app/src/sharedTest/java/dagger/android/simple/SimpleActivityTest.java b/javatests/artifacts/dagger-android/simple/app/src/sharedTest/java/dagger/android/simple/SimpleActivityTest.java
index 52f9b0269..024da5c5f 100644
--- a/javatests/artifacts/dagger-android/simple/app/src/sharedTest/java/dagger/android/simple/SimpleActivityTest.java
+++ b/javatests/artifacts/dagger-android/simple/app/src/sharedTest/java/dagger/android/simple/SimpleActivityTest.java
@@ -23,14 +23,18 @@ import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.os.Build;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
 
-/** A simple test using Hilt that can be run with instrumentation or Robolectric tests. */
+/** A simple test using dagger-android that can be run with instrumentation or Robolectric tests. */
 @RunWith(AndroidJUnit4.class)
+// Robolectric requires Java9 to run API 29 and above, so use API 28 instead
+@Config(sdk = Build.VERSION_CODES.P)
 public final class SimpleActivityTest {
 
   @Test
diff --git a/javatests/artifacts/dagger-android/simple/build.gradle b/javatests/artifacts/dagger-android/simple/build.gradle
index bc18f972f..f83133392 100644
--- a/javatests/artifacts/dagger-android/simple/build.gradle
+++ b/javatests/artifacts/dagger-android/simple/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 
diff --git a/javatests/artifacts/dagger-android/simple/gradle.properties b/javatests/artifacts/dagger-android/simple/gradle.properties
new file mode 100644
index 000000000..2d8d1e4dd
--- /dev/null
+++ b/javatests/artifacts/dagger-android/simple/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
\ No newline at end of file
diff --git a/javatests/artifacts/dagger-android/simple/gradle/wrapper/gradle-wrapper.properties b/javatests/artifacts/dagger-android/simple/gradle/wrapper/gradle-wrapper.properties
index f4d7b2bf6..be52383ef 100644
--- a/javatests/artifacts/dagger-android/simple/gradle/wrapper/gradle-wrapper.properties
+++ b/javatests/artifacts/dagger-android/simple/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/javatests/artifacts/dagger/simple/gradle/wrapper/gradle-wrapper.properties b/javatests/artifacts/dagger/simple/gradle/wrapper/gradle-wrapper.properties
index f4d7b2bf6..be52383ef 100644
--- a/javatests/artifacts/dagger/simple/gradle/wrapper/gradle-wrapper.properties
+++ b/javatests/artifacts/dagger/simple/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/javatests/artifacts/hilt-android/simple/app/build.gradle b/javatests/artifacts/hilt-android/simple/app/build.gradle
index 6ead8809f..0f8a05aab 100644
--- a/javatests/artifacts/hilt-android/simple/app/build.gradle
+++ b/javatests/artifacts/hilt-android/simple/app/build.gradle
@@ -18,13 +18,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'dagger.hilt.android.plugin'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "dagger.hilt.android.simple"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "dagger.hilt.android.simple.SimpleEmulatorTestRunner"
@@ -64,25 +64,25 @@ configurations.all {
 dependencies {
   implementation project(':feature')
   implementation project(':lib')
-  implementation 'androidx.appcompat:appcompat:1.1.0'
+  implementation 'androidx.appcompat:appcompat:1.2.0'
   implementation "com.google.dagger:hilt-android:$dagger_version"
   annotationProcessor "com.google.dagger:hilt-compiler:$dagger_version"
 
   testImplementation 'com.google.truth:truth:1.0.1'
   testImplementation 'junit:junit:4.13'
-  testImplementation 'org.robolectric:robolectric:4.3.1'
-  testImplementation 'androidx.core:core:1.2.0'
-  testImplementation 'androidx.test.ext:junit:1.1.1'
-  testImplementation 'androidx.test:runner:1.2.0'
-  testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+  testImplementation 'org.robolectric:robolectric:4.5-alpha-3'
+  testImplementation 'androidx.core:core:1.3.2'
+  testImplementation 'androidx.test.ext:junit:1.1.2'
+  testImplementation 'androidx.test:runner:1.3.0'
+  testImplementation 'androidx.test.espresso:espresso-core:3.3.0'
   testImplementation "com.google.dagger:hilt-android-testing:$dagger_version"
   testAnnotationProcessor "com.google.dagger:hilt-compiler:$dagger_version"
 
   androidTestImplementation 'com.google.truth:truth:1.0.1'
   androidTestImplementation 'junit:junit:4.13'
-  androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-  androidTestImplementation 'androidx.test:runner:1.2.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+  androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+  androidTestImplementation 'androidx.test:runner:1.3.0'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
   androidTestImplementation "com.google.dagger:hilt-android-testing:$dagger_version"
   androidTestAnnotationProcessor "com.google.dagger:hilt-compiler:$dagger_version"
 
diff --git a/javatests/artifacts/hilt-android/simple/build.gradle b/javatests/artifacts/hilt-android/simple/build.gradle
index 554e93cbb..539137a42 100644
--- a/javatests/artifacts/hilt-android/simple/build.gradle
+++ b/javatests/artifacts/hilt-android/simple/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     ext {
         dagger_version = 'LOCAL-SNAPSHOT'
         kotlin_version = '1.3.61'
-        agp_version = System.getenv('AGP_VERSION') ?: "3.6.3"
+        agp_version = System.getenv('AGP_VERSION') ?: "4.1.1"
     }
     repositories {
         google()
diff --git a/javatests/artifacts/hilt-android/simple/feature/build.gradle b/javatests/artifacts/hilt-android/simple/feature/build.gradle
index 355768371..8cf3dd59a 100644
--- a/javatests/artifacts/hilt-android/simple/feature/build.gradle
+++ b/javatests/artifacts/hilt-android/simple/feature/build.gradle
@@ -20,12 +20,12 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'dagger.hilt.android.plugin'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -48,7 +48,7 @@ dependencies {
     // by the app need to expose @kotlin.Metadata
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "com.google.dagger:hilt-android:$dagger_version"
     kapt "com.google.dagger:hilt-compiler:$dagger_version"
 }
diff --git a/javatests/artifacts/hilt-android/simple/gradle/wrapper/gradle-wrapper.properties b/javatests/artifacts/hilt-android/simple/gradle/wrapper/gradle-wrapper.properties
index a4b442974..be52383ef 100644
--- a/javatests/artifacts/hilt-android/simple/gradle/wrapper/gradle-wrapper.properties
+++ b/javatests/artifacts/hilt-android/simple/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/javatests/artifacts/hilt-android/simpleKotlin/app/build.gradle b/javatests/artifacts/hilt-android/simpleKotlin/app/build.gradle
index 95eeb159e..8dcf6a8d1 100644
--- a/javatests/artifacts/hilt-android/simpleKotlin/app/build.gradle
+++ b/javatests/artifacts/hilt-android/simpleKotlin/app/build.gradle
@@ -20,13 +20,13 @@ apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "dagger.hilt.android.simpleKotlin"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "dagger.hilt.android.example.gradle.simpleKotlin.TestRunner"
@@ -55,7 +55,7 @@ hilt {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.activity:activity-ktx:1.1.0'
 
     implementation 'com.google.dagger:hilt-android:LOCAL-SNAPSHOT'
@@ -63,8 +63,8 @@ dependencies {
 
     testImplementation 'com.google.truth:truth:1.0.1'
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.robolectric:robolectric:4.3.1'
-    testImplementation 'androidx.core:core:1.1.0'
+    testImplementation 'org.robolectric:robolectric:4.5-alpha-3'
+    testImplementation 'androidx.core:core:1.3.2'
     // TODO(bcorso): This multidex dep shouldn't be required -- it's a dep for the generated code.
     testImplementation 'androidx.multidex:multidex:2.0.0'
     testImplementation 'com.google.dagger:hilt-android-testing:LOCAL-SNAPSHOT'
diff --git a/javatests/artifacts/hilt-android/simpleKotlin/app/src/test/resources/dagger/hilt/android/simpleKotlin/robolectric.properties b/javatests/artifacts/hilt-android/simpleKotlin/app/src/test/resources/dagger/hilt/android/simpleKotlin/robolectric.properties
new file mode 100644
index 000000000..0234ffe6f
--- /dev/null
+++ b/javatests/artifacts/hilt-android/simpleKotlin/app/src/test/resources/dagger/hilt/android/simpleKotlin/robolectric.properties
@@ -0,0 +1,2 @@
+sdk=28
+application=dagger.hilt.android.testing.HiltTestApplication
\ No newline at end of file
diff --git a/javatests/artifacts/hilt-android/simpleKotlin/build.gradle b/javatests/artifacts/hilt-android/simpleKotlin/build.gradle
index e1edb8d93..17f228968 100644
--- a/javatests/artifacts/hilt-android/simpleKotlin/build.gradle
+++ b/javatests/artifacts/hilt-android/simpleKotlin/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext {
         kotlin_version = '1.3.61'
-        agp_version = System.getenv('AGP_VERSION') ?: "3.6.3"
+        agp_version = System.getenv('AGP_VERSION') ?: "4.1.1"
     }
     repositories {
         google()
diff --git a/javatests/artifacts/hilt-android/simpleKotlin/gradle/wrapper/gradle-wrapper.properties b/javatests/artifacts/hilt-android/simpleKotlin/gradle/wrapper/gradle-wrapper.properties
index a4b442974..be52383ef 100644
--- a/javatests/artifacts/hilt-android/simpleKotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/javatests/artifacts/hilt-android/simpleKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/javatests/dagger/android/processor/BUILD b/javatests/dagger/android/processor/BUILD
index 21954ea5c..d7b210c5e 100644
--- a/javatests/dagger/android/processor/BUILD
+++ b/javatests/dagger/android/processor/BUILD
@@ -32,7 +32,7 @@ GenJavaTests(
         "//java/dagger/internal/codegen:processor",
         "//java/dagger/internal/guava:base",
         "//java/dagger/internal/guava:collect",
-        "@androidsdk//:platforms/android-29/android.jar",
+        "@androidsdk//:platforms/android-30/android.jar",
         "@google_bazel_common//third_party/java/compile_testing",
         "@google_bazel_common//third_party/java/junit",
         "@google_bazel_common//third_party/java/truth",
diff --git a/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD b/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD
index f1308d2a4..d56ed2188 100644
--- a/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD
+++ b/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD
@@ -23,7 +23,7 @@ compiler_test(
     srcs = ["ActivityGeneratorTest.java"],
     compiler_deps = [
         "//java/dagger/hilt/android:android_entry_point",
-        "@androidsdk//:platforms/android-29/android.jar",
+        "@androidsdk//:platforms/android-30/android.jar",
     ],
     deps = [
         "//javatests/dagger/hilt/android/processor:android_compilers",
@@ -39,7 +39,7 @@ compiler_test(
     compiler_deps = [
         "//java/dagger/hilt/android:hilt_android_app",
         "//java/dagger/hilt/android:android_entry_point",
-        "@androidsdk//:platforms/android-29/android.jar",
+        "@androidsdk//:platforms/android-30/android.jar",
     ],
     deps = [
         "//javatests/dagger/hilt/android/processor:android_compilers",
@@ -55,7 +55,7 @@ compiler_test(
     compiler_deps = [
         "//java/dagger/hilt/android:hilt_android_app",
         "//java/dagger/hilt/android:android_entry_point",
-        "@androidsdk//:platforms/android-29/android.jar",
+        "@androidsdk//:platforms/android-30/android.jar",
     ],
     deps = [
         "//java/dagger/internal/guava:collect",
diff --git a/javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD b/javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD
index fbbfe7ce2..76a8ba6b9 100644
--- a/javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD
+++ b/javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD
@@ -24,7 +24,7 @@ java_test(
     runtime_deps = [
         ":ViewModelProcessorTestLib",
         "//java/dagger/hilt/android/lifecycle",
-        "@androidsdk//:platforms/android-29/android.jar",
+        "@androidsdk//:platforms/android-30/android.jar",
         "@google_bazel_common//third_party/java/compile_testing",
         "@google_bazel_common//third_party/java/truth",
         "@maven//:androidx_lifecycle_lifecycle_viewmodel",
@@ -51,7 +51,7 @@ java_test(
     runtime_deps = [
         ":ViewModelGeneratorTestLib",
         "//java/dagger/hilt/android/lifecycle",
-        "@androidsdk//:platforms/android-29/android.jar",
+        "@androidsdk//:platforms/android-30/android.jar",
         "@google_bazel_common//third_party/java/compile_testing",
         "@google_bazel_common//third_party/java/truth",
         "@maven//:androidx_lifecycle_lifecycle_viewmodel",
diff --git a/util/run-local-emulator-tests.sh b/util/run-local-emulator-tests.sh
index 8d4552575..49f52853f 100755
--- a/util/run-local-emulator-tests.sh
+++ b/util/run-local-emulator-tests.sh
@@ -4,7 +4,7 @@
 #
 #  To run this script, just pass in a valid avd name:
 #
-#    $ path/to/run-local-emulator-tests.sh Android29
+#    $ path/to/run-local-emulator-tests.sh Android30
 
 set -ex
 
diff --git a/util/run-local-tests.sh b/util/run-local-tests.sh
index 0ed880f92..9ea08d847 100755
--- a/util/run-local-tests.sh
+++ b/util/run-local-tests.sh
@@ -25,7 +25,7 @@ done
 
 
 # Run gradle tests with different versions of Android Gradle Plugin
-readonly AGP_VERSIONS=("4.1.0-alpha07" "4.0.0-beta05" "3.6.3")
+readonly AGP_VERSIONS=("4.0.2" "3.6.4")
 readonly ANDROID_GRADLE_PROJECTS=(
     "java/dagger/example/gradle/android/simple"
     "javatests/artifacts/dagger-android/simple"