From fe9a2f9ff14dc9ed9b7a13520278036404b2622d Mon Sep 17 00:00:00 2001 From: Brad Corso Date: Thu, 19 Dec 2024 12:00:46 -0800 Subject: [PATCH] Update Dagger to use Android SDK 34. 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 --- BUILD | 2 +- CONTRIBUTING.md | 4 ++-- WORKSPACE | 4 ++-- examples/bazel/WORKSPACE | 4 ++-- java/dagger/android/BUILD | 2 +- java/dagger/android/support/BUILD | 2 +- java/dagger/hilt/android/BUILD | 2 +- java/dagger/hilt/android/processor/BUILD | 2 +- java/dagger/hilt/android/testing/BUILD | 2 +- java/dagger/hilt/processor/BUILD | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/BUILD b/BUILD index f8b02b5064d..6650ea6d6ab 100644 --- 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 index 8975bcbc395..d2ef1bac3d8 100644 --- 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 `, or `bazel test //...` to run all tests. diff --git a/WORKSPACE b/WORKSPACE index 9795eae78df..e84385e77f7 100644 --- 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 index de4757598cc..7c9a8dba3c2 100644 --- 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 index e445d2e21fb..fe2183b2d73 100644 --- 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 index bedf1ffeb65..aa01899254b 100644 --- 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 index 5dbc628821f..d543c3ee43f 100644 --- 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 index cd4c342cdbd..4e4357ef917 100644 --- 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 index d963bd32895..ac05b99b3cf 100644 --- 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 index fb5782f913f..4e90e76c21d 100644 --- 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",