Update Dagger to use Android SDK 34.

bcorso · Dagger Team · commit fe9a2f9ff14d · 2024-12-19T12:05:30.000-08:00
Dagger was using SDK 32, but that is no longer shipped with GitHub Actions by default. https://github.com/google/dagger/actions/runs/12416363360/job/34664836067 RELNOTES=N/A PiperOrigin-RevId: 707984837
diff --git a/BUILD b/BUILD
@@ -116,7 +116,7 @@ javadoc_library(
         "//java/dagger/producers:producers-srcs",
         "//java/dagger/spi:spi-srcs",
     ],
-    android_api_level = 32,
+    android_api_level = 34,
     # 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
@@ -44,9 +44,9 @@ attempt to delete the `build/` folder will also delete the bazel `BUILD` files.
             [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-32" "build-tools;32.0.0"`
+            `$ANDROID_HOME/tools/bin/sdkmanager "platforms;android-34" "build-tools;34.0.0"`
             *   If you skip this step, you will see an error similar to
-                `ERROR: missing input file '@androidsdk//:build-tools/32.0.0/aapt'`.
+                `ERROR: missing input file '@androidsdk//:build-tools/34.0.0/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
@@ -63,8 +63,8 @@ http_archive(
 
 android_sdk_repository(
     name = "androidsdk",
-    api_level = 32,
-    build_tools_version = "32.0.0",
+    api_level = 34,
+    build_tools_version = "34.0.0",
 )
 
 ####################################################
diff --git a/examples/bazel/WORKSPACE b/examples/bazel/WORKSPACE
@@ -41,8 +41,8 @@ load(
 
 android_sdk_repository(
     name = "androidsdk",
-    api_level = 32,
-    build_tools_version = "32.0.0",
+    api_level = 34,
+    build_tools_version = "34.0.0",
 )
 
 #############################
diff --git a/java/dagger/android/BUILD b/java/dagger/android/BUILD
@@ -71,7 +71,7 @@ gen_maven_artifact(
         "com.google.dagger:dagger",
         "com.google.dagger:dagger-lint-aar",
     ],
-    javadoc_android_api_level = 32,
+    javadoc_android_api_level = 34,
     javadoc_root_packages = [
         "dagger.android",
     ],
diff --git a/java/dagger/android/support/BUILD b/java/dagger/android/support/BUILD
@@ -70,7 +70,7 @@ gen_maven_artifact(
         "com.google.dagger:dagger",
         "com.google.dagger:dagger-android",
     ],
-    javadoc_android_api_level = 32,
+    javadoc_android_api_level = 34,
     javadoc_root_packages = [
         "dagger.android.support",
     ],
diff --git a/java/dagger/hilt/android/BUILD b/java/dagger/hilt/android/BUILD
@@ -249,7 +249,7 @@ gen_maven_artifact(
         "com.google.guava:guava",
         "javax.annotation:javax.annotation-api",
     ],
-    javadoc_android_api_level = 32,
+    javadoc_android_api_level = 34,
     javadoc_exclude_packages = [
         "dagger.hilt.android.internal",
     ],
diff --git a/java/dagger/hilt/android/processor/BUILD b/java/dagger/hilt/android/processor/BUILD
@@ -93,7 +93,7 @@ gen_maven_artifact(
         "net.ltgt.gradle.incap:incap",
         "org.jetbrains.kotlin:kotlin-stdlib",
     ],
-    javadoc_android_api_level = 32,
+    javadoc_android_api_level = 34,
     javadoc_root_packages = [
         # Java 11 javadocs requires non-empty root package so use ".internal" as the root package.
         "dagger.hilt.processor.internal",
diff --git a/java/dagger/hilt/android/testing/BUILD b/java/dagger/hilt/android/testing/BUILD
@@ -249,7 +249,7 @@ gen_maven_artifact(
         "com.google.guava:guava",
         "javax.annotation:javax.annotation-api",
     ],
-    javadoc_android_api_level = 32,
+    javadoc_android_api_level = 34,
     javadoc_exclude_packages = [
         "dagger.hilt.internal",
         "dagger.hilt.android.internal",
diff --git a/java/dagger/hilt/processor/BUILD b/java/dagger/hilt/processor/BUILD
@@ -115,7 +115,7 @@ gen_maven_artifact(
         "net.ltgt.gradle.incap:incap",
         "org.jetbrains.kotlin:kotlin-stdlib",
     ],
-    javadoc_android_api_level = 32,
+    javadoc_android_api_level = 34,
     javadoc_root_packages = [
         # Java 11 javadocs requires non-empty root package so use ".internal" as the root package.
         "dagger.hilt.processor.internal",

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ http_archive(`
`63`	`63`
`64`	`64`	`android_sdk_repository(`
`65`	`65`	`name = "androidsdk",`
`66`		`- api_level = 32,`
`67`		`- build_tools_version = "32.0.0",`
	`66`	`+ api_level = 34,`
	`67`	`+ build_tools_version = "34.0.0",`
`68`	`68`	`)`
`69`	`69`
`70`	`70`	`####################################################`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ load(`
`41`	`41`
`42`	`42`	`android_sdk_repository(`
`43`	`43`	`name = "androidsdk",`
`44`		`- api_level = 32,`
`45`		`- build_tools_version = "32.0.0",`
	`44`	`+ api_level = 34,`
	`45`	`+ build_tools_version = "34.0.0",`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`#############################`