Skip to content

Commit e5582ae

Browse files
bcorsoDagger Team
authored and
Dagger Team
committed
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: 707923924
1 parent d60729d commit e5582ae

File tree

22 files changed

+33
-33
lines changed

22 files changed

+33
-33
lines changed

BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ javadoc_library(
116116
"//java/dagger/producers:producers-srcs",
117117
"//java/dagger/spi:spi-srcs",
118118
],
119-
android_api_level = 32,
119+
android_api_level = 34,
120120
# TODO(ronshapiro): figure out how to specify the version number for release builds
121121
doctitle = "Dagger Dependency Injection API",
122122
exclude_packages = [

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ attempt to delete the `build/` folder will also delete the bazel `BUILD` files.
4444
[download](https://developer.android.com/studio#command-tools)
4545
and unzip it first.
4646
* Install the necessary components. For example, under Linux, run:
47-
`$ANDROID_HOME/tools/bin/sdkmanager "platforms;android-32" "build-tools;32.0.0"`
47+
`$ANDROID_HOME/tools/bin/sdkmanager "platforms;android-34" "build-tools;34.0.0"`
4848
* If you skip this step, you will see an error similar to
49-
`ERROR: missing input file '@androidsdk//:build-tools/32.0.0/aapt'`.
49+
`ERROR: missing input file '@androidsdk//:build-tools/34.0.0/aapt'`.
5050
* You may also need to run `bazel sync`.
5151
* Run tests with `bazel test <target>`, or `bazel test //...` to run all
5252
tests.

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ http_archive(
6363

6464
android_sdk_repository(
6565
name = "androidsdk",
66-
api_level = 32,
67-
build_tools_version = "32.0.0",
66+
api_level = 34,
67+
build_tools_version = "34.0.0",
6868
)
6969

7070
####################################################

examples/bazel/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ load(
4141

4242
android_sdk_repository(
4343
name = "androidsdk",
44-
api_level = 32,
45-
build_tools_version = "32.0.0",
44+
api_level = 34,
45+
build_tools_version = "34.0.0",
4646
)
4747

4848
#############################

java/dagger/android/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ gen_maven_artifact(
7171
"com.google.dagger:dagger",
7272
"com.google.dagger:dagger-lint-aar",
7373
],
74-
javadoc_android_api_level = 32,
74+
javadoc_android_api_level = 34,
7575
javadoc_root_packages = [
7676
"dagger.android",
7777
],

java/dagger/android/support/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ gen_maven_artifact(
7070
"com.google.dagger:dagger",
7171
"com.google.dagger:dagger-android",
7272
],
73-
javadoc_android_api_level = 32,
73+
javadoc_android_api_level = 34,
7474
javadoc_root_packages = [
7575
"dagger.android.support",
7676
],

java/dagger/hilt/android/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ gen_maven_artifact(
249249
"com.google.guava:guava",
250250
"javax.annotation:javax.annotation-api",
251251
],
252-
javadoc_android_api_level = 32,
252+
javadoc_android_api_level = 34,
253253
javadoc_exclude_packages = [
254254
"dagger.hilt.android.internal",
255255
],

java/dagger/hilt/android/processor/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ gen_maven_artifact(
9393
"net.ltgt.gradle.incap:incap",
9494
"org.jetbrains.kotlin:kotlin-stdlib",
9595
],
96-
javadoc_android_api_level = 32,
96+
javadoc_android_api_level = 34,
9797
javadoc_root_packages = [
9898
# Java 11 javadocs requires non-empty root package so use ".internal" as the root package.
9999
"dagger.hilt.processor.internal",

java/dagger/hilt/android/testing/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ gen_maven_artifact(
249249
"com.google.guava:guava",
250250
"javax.annotation:javax.annotation-api",
251251
],
252-
javadoc_android_api_level = 32,
252+
javadoc_android_api_level = 34,
253253
javadoc_exclude_packages = [
254254
"dagger.hilt.internal",
255255
"dagger.hilt.android.internal",

java/dagger/hilt/processor/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ gen_maven_artifact(
115115
"net.ltgt.gradle.incap:incap",
116116
"org.jetbrains.kotlin:kotlin-stdlib",
117117
],
118-
javadoc_android_api_level = 32,
118+
javadoc_android_api_level = 34,
119119
javadoc_root_packages = [
120120
# Java 11 javadocs requires non-empty root package so use ".internal" as the root package.
121121
"dagger.hilt.processor.internal",

javatests/dagger/android/processor/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ GenJavaTests(
3636
"//third_party/java/guava/collect",
3737
"//third_party/java/junit",
3838
"//third_party/java/truth",
39-
"@androidsdk//:platforms/android-32/android.jar",
39+
"@androidsdk//:platforms/android-34/android.jar",
4040
"@maven//:androidx_activity_activity",
4141
"@maven//:androidx_fragment_fragment",
4242
"@maven//:androidx_lifecycle_lifecycle_common",

javatests/dagger/hilt/android/processor/internal/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ compiler_test(
2424
compiler_deps = [
2525
"//java/dagger/hilt/android:hilt_android_app",
2626
"//java/dagger/hilt/android:android_entry_point",
27-
"@androidsdk//:platforms/android-32/android.jar",
27+
"@androidsdk//:platforms/android-34/android.jar",
2828
"@maven//:androidx_annotation_annotation",
2929
],
3030
deps = [

javatests/dagger/hilt/android/processor/internal/aggregateddeps/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ compiler_test(
3131
"//java/dagger/hilt/android/internal/modules",
3232
"//java/dagger/hilt/testing:test_install_in",
3333
"//java/dagger/hilt/android/testing:hilt_android_test",
34-
"@androidsdk//:platforms/android-32/android.jar",
34+
"@androidsdk//:platforms/android-34/android.jar",
3535
],
3636
deps = [
3737
"//java/dagger/hilt/android/testing/compile",
@@ -50,7 +50,7 @@ compiler_test(
5050
"//java/dagger/hilt/android:early_entry_point",
5151
"//java/dagger/hilt/android/components",
5252
"//java/dagger/hilt/android/testing:hilt_android_test",
53-
"@androidsdk//:platforms/android-32/android.jar",
53+
"@androidsdk//:platforms/android-34/android.jar",
5454
],
5555
deps = [
5656
"//java/dagger/hilt/android/testing/compile",

javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ compiler_test(
2323
srcs = ["ActivityGeneratorTest.java"],
2424
compiler_deps = [
2525
"//java/dagger/hilt/android:android_entry_point",
26-
"@androidsdk//:platforms/android-32/android.jar",
26+
"@androidsdk//:platforms/android-34/android.jar",
2727
],
2828
resources = glob([
2929
"goldens/ActivityGeneratorTest_*",
@@ -42,7 +42,7 @@ compiler_test(
4242
compiler_deps = [
4343
"//java/dagger/hilt/android:hilt_android_app",
4444
"//java/dagger/hilt/android:android_entry_point",
45-
"@androidsdk//:platforms/android-32/android.jar",
45+
"@androidsdk//:platforms/android-34/android.jar",
4646
],
4747
deps = [
4848
"//java/dagger/hilt/android/testing/compile",
@@ -59,7 +59,7 @@ kt_compiler_test(
5959
compiler_deps = [
6060
"//java/dagger/hilt/android:hilt_android_app",
6161
"//java/dagger/hilt/android:android_entry_point",
62-
"@androidsdk//:platforms/android-32/android.jar",
62+
"@androidsdk//:platforms/android-34/android.jar",
6363
],
6464
deps = [
6565
"//java/dagger/hilt/android/testing/compile",

javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ compiler_test(
2525
"//java/dagger/hilt/android/testing:custom_test_application",
2626
"//java/dagger/hilt/android/testing:hilt_android_test",
2727
"//java/dagger/hilt/android:hilt_android_app",
28-
"@androidsdk//:platforms/android-32/android.jar",
28+
"@androidsdk//:platforms/android-34/android.jar",
2929
],
3030
deps = [
3131
"//java/dagger/hilt/android/testing/compile",

javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kt_compiler_test(
2525
srcs = ["ViewModelProcessorTest.kt"],
2626
compiler_deps = [
2727
"//java/dagger/hilt/android:hilt_android_app",
28-
"@androidsdk//:platforms/android-32/android.jar",
28+
"@androidsdk//:platforms/android-34/android.jar",
2929
"//java/dagger/hilt/android/lifecycle:hilt_view_model",
3030
],
3131
deps = [
@@ -44,7 +44,7 @@ kt_compiler_test(
4444
"ViewModelValidationPluginTest.kt",
4545
],
4646
compiler_deps = [
47-
"@androidsdk//:platforms/android-32/android.jar",
47+
"@androidsdk//:platforms/android-34/android.jar",
4848
"@maven//:androidx_lifecycle_lifecycle_viewmodel",
4949
"@maven//:androidx_lifecycle_lifecycle_viewmodel_savedstate",
5050
"//third_party/java/compile_testing",
@@ -76,7 +76,7 @@ kt_compiler_test(
7676
"ViewModelValidationPluginWithAssistedInjectTest.kt",
7777
],
7878
compiler_deps = [
79-
"@androidsdk//:platforms/android-32/android.jar",
79+
"@androidsdk//:platforms/android-34/android.jar",
8080
"@maven//:androidx_lifecycle_lifecycle_viewmodel",
8181
"@maven//:androidx_lifecycle_lifecycle_viewmodel_savedstate",
8282
"//third_party/java/compile_testing",

javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ compiler_test(
3232
"//java/dagger/hilt:install_in",
3333
"//java/dagger/hilt/android/testing:hilt_android_test",
3434
"//java/dagger/hilt/android/components",
35-
"@androidsdk//:platforms/android-32/android.jar",
35+
"@androidsdk//:platforms/android-34/android.jar",
3636
],
3737
deps = [
3838
"//java/dagger/hilt/android/testing/compile",

javatests/dagger/hilt/processor/internal/aliasof/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ compiler_test(
2424
size = "small",
2525
srcs = ["AliasOfProcessorTest.java"],
2626
compiler_deps = [
27-
"@androidsdk//:platforms/android-32/android.jar",
27+
"@androidsdk//:platforms/android-34/android.jar",
2828
"//third_party/java/jsr330_inject",
2929
"//java/dagger/hilt/android:hilt_android_app",
3030
"//java/dagger/hilt/android/components",

javatests/dagger/hilt/processor/internal/generatesrootinput/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ compiler_test(
2424
srcs = ["GeneratesRootInputProcessorTest.java"],
2525
compiler_deps = [
2626
"//java/dagger/hilt:generates_root_input",
27-
"@androidsdk//:platforms/android-32/android.jar",
27+
"@androidsdk//:platforms/android-34/android.jar",
2828
"@maven//:androidx_annotation_annotation",
2929
],
3030
deps = [

javatests/dagger/hilt/processor/internal/originatingelement/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ compiler_test(
2424
srcs = ["OriginatingElementProcessorTest.java"],
2525
compiler_deps = [
2626
"//java/dagger/hilt/codegen:originating_element",
27-
"@androidsdk//:platforms/android-32/android.jar",
27+
"@androidsdk//:platforms/android-34/android.jar",
2828
"@maven//:androidx_annotation_annotation",
2929
],
3030
deps = [

javatests/dagger/hilt/processor/internal/root/BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ compiler_test(
3434
":MyAppPreviousCompilation",
3535
"//java/dagger/hilt/android:hilt_android_app",
3636
"//java/dagger/hilt/android/testing:hilt_android_test",
37-
"@androidsdk//:platforms/android-32/android.jar",
37+
"@androidsdk//:platforms/android-34/android.jar",
3838
"@maven//:androidx_annotation_annotation",
3939
"@maven//:org_robolectric_robolectric",
4040
"@maven//:androidx_test_ext_junit",
@@ -65,7 +65,7 @@ compiler_test(
6565
":MyTestPreviousCompilation",
6666
"//java/dagger/hilt/android:hilt_android_app",
6767
"//java/dagger/hilt/android/testing:hilt_android_test",
68-
"@androidsdk//:platforms/android-32/android.jar",
68+
"@androidsdk//:platforms/android-34/android.jar",
6969
"@maven//:androidx_annotation_annotation",
7070
"@maven//:org_robolectric_robolectric",
7171
"@maven//:androidx_test_ext_junit",
@@ -86,7 +86,7 @@ compiler_test(
8686
compiler_deps = [
8787
"//java/dagger/hilt/android:hilt_android_app",
8888
"//java/dagger/hilt/android/testing:hilt_android_test",
89-
"@androidsdk//:platforms/android-32/android.jar",
89+
"@androidsdk//:platforms/android-34/android.jar",
9090
"@maven//:androidx_annotation_annotation",
9191
"@maven//:org_robolectric_robolectric",
9292
"@maven//:androidx_test_ext_junit",
@@ -106,7 +106,7 @@ compiler_test(
106106
compiler_deps = [
107107
"//java/dagger/hilt/android:hilt_android_app",
108108
"//java/dagger/hilt/android/testing:hilt_android_test",
109-
"@androidsdk//:platforms/android-32/android.jar",
109+
"@androidsdk//:platforms/android-34/android.jar",
110110
"@maven//:androidx_annotation_annotation",
111111
"@maven//:org_robolectric_robolectric",
112112
"@maven//:androidx_test_ext_junit",

javatests/dagger/hilt/processor/internal/uninstallmodules/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ compiler_test(
2727
"//java/dagger/hilt/android/testing:hilt_android_test",
2828
"//java/dagger/hilt/android/testing:uninstall_modules",
2929
"//java/dagger/hilt/migration:disable_install_in_check",
30-
"@androidsdk//:platforms/android-32/android.jar",
30+
"@androidsdk//:platforms/android-34/android.jar",
3131
"@maven//:androidx_annotation_annotation",
3232
],
3333
deps = [

0 commit comments

Comments
 (0)