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", diff --git a/java/dagger/internal/codegen/xprocessing/xprocessing-testing.jar b/java/dagger/internal/codegen/xprocessing/xprocessing-testing.jar index 880787cd9a5..f7f02031862 100644 Binary files a/java/dagger/internal/codegen/xprocessing/xprocessing-testing.jar and b/java/dagger/internal/codegen/xprocessing/xprocessing-testing.jar differ diff --git a/java/dagger/internal/codegen/xprocessing/xprocessing.jar b/java/dagger/internal/codegen/xprocessing/xprocessing.jar index c19640ffed6..31833cc5bad 100644 Binary files a/java/dagger/internal/codegen/xprocessing/xprocessing.jar and b/java/dagger/internal/codegen/xprocessing/xprocessing.jar differ diff --git a/javatests/dagger/android/processor/BUILD b/javatests/dagger/android/processor/BUILD index 518234d0abe..ddf930bf20f 100644 --- a/javatests/dagger/android/processor/BUILD +++ b/javatests/dagger/android/processor/BUILD @@ -36,7 +36,7 @@ GenJavaTests( "//third_party/java/guava/collect", "//third_party/java/junit", "//third_party/java/truth", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_activity_activity", "@maven//:androidx_fragment_fragment", "@maven//:androidx_lifecycle_lifecycle_common", diff --git a/javatests/dagger/hilt/android/processor/internal/BUILD b/javatests/dagger/hilt/android/processor/internal/BUILD index ac89e9dea43..8bb88bd332b 100644 --- a/javatests/dagger/hilt/android/processor/internal/BUILD +++ b/javatests/dagger/hilt/android/processor/internal/BUILD @@ -24,7 +24,7 @@ compiler_test( compiler_deps = [ "//java/dagger/hilt/android:hilt_android_app", "//java/dagger/hilt/android:android_entry_point", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_annotation_annotation", ], deps = [ diff --git a/javatests/dagger/hilt/android/processor/internal/aggregateddeps/BUILD b/javatests/dagger/hilt/android/processor/internal/aggregateddeps/BUILD index 36fb39392e6..2cf63e02016 100644 --- a/javatests/dagger/hilt/android/processor/internal/aggregateddeps/BUILD +++ b/javatests/dagger/hilt/android/processor/internal/aggregateddeps/BUILD @@ -31,7 +31,7 @@ compiler_test( "//java/dagger/hilt/android/internal/modules", "//java/dagger/hilt/testing:test_install_in", "//java/dagger/hilt/android/testing:hilt_android_test", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", ], deps = [ "//java/dagger/hilt/android/testing/compile", @@ -50,7 +50,7 @@ compiler_test( "//java/dagger/hilt/android:early_entry_point", "//java/dagger/hilt/android/components", "//java/dagger/hilt/android/testing:hilt_android_test", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", ], deps = [ "//java/dagger/hilt/android/testing/compile", diff --git a/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD b/javatests/dagger/hilt/android/processor/internal/androidentrypoint/BUILD index f771cc99fd7..33bd535d922 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-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", ], resources = glob([ "goldens/ActivityGeneratorTest_*", @@ -42,7 +42,7 @@ compiler_test( compiler_deps = [ "//java/dagger/hilt/android:hilt_android_app", "//java/dagger/hilt/android:android_entry_point", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", ], deps = [ "//java/dagger/hilt/android/testing/compile", @@ -59,7 +59,7 @@ kt_compiler_test( compiler_deps = [ "//java/dagger/hilt/android:hilt_android_app", "//java/dagger/hilt/android:android_entry_point", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", ], deps = [ "//java/dagger/hilt/android/testing/compile", diff --git a/javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD b/javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD index a8d2cb97db9..47c96886563 100644 --- a/javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD +++ b/javatests/dagger/hilt/android/processor/internal/customtestapplication/BUILD @@ -25,7 +25,7 @@ compiler_test( "//java/dagger/hilt/android/testing:custom_test_application", "//java/dagger/hilt/android/testing:hilt_android_test", "//java/dagger/hilt/android:hilt_android_app", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", ], deps = [ "//java/dagger/hilt/android/testing/compile", diff --git a/javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD b/javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD index b127124f55b..129a4fac959 100644 --- a/javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD +++ b/javatests/dagger/hilt/android/processor/internal/viewmodel/BUILD @@ -25,7 +25,7 @@ kt_compiler_test( srcs = ["ViewModelProcessorTest.kt"], compiler_deps = [ "//java/dagger/hilt/android:hilt_android_app", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "//java/dagger/hilt/android/lifecycle:hilt_view_model", ], deps = [ @@ -44,7 +44,7 @@ kt_compiler_test( "ViewModelValidationPluginTest.kt", ], compiler_deps = [ - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_lifecycle_lifecycle_viewmodel", "@maven//:androidx_lifecycle_lifecycle_viewmodel_savedstate", "//third_party/java/compile_testing", @@ -76,7 +76,7 @@ kt_compiler_test( "ViewModelValidationPluginWithAssistedInjectTest.kt", ], compiler_deps = [ - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_lifecycle_lifecycle_viewmodel", "@maven//:androidx_lifecycle_lifecycle_viewmodel_savedstate", "//third_party/java/compile_testing", diff --git a/javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD b/javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD index 9ddf52a8f2b..1ad0176863c 100644 --- a/javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD +++ b/javatests/dagger/hilt/processor/internal/aggregateddeps/BUILD @@ -32,7 +32,7 @@ compiler_test( "//java/dagger/hilt:install_in", "//java/dagger/hilt/android/testing:hilt_android_test", "//java/dagger/hilt/android/components", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", ], deps = [ "//java/dagger/hilt/android/testing/compile", diff --git a/javatests/dagger/hilt/processor/internal/aliasof/BUILD b/javatests/dagger/hilt/processor/internal/aliasof/BUILD index a56e14061ea..da1fd37e2b6 100644 --- a/javatests/dagger/hilt/processor/internal/aliasof/BUILD +++ b/javatests/dagger/hilt/processor/internal/aliasof/BUILD @@ -24,7 +24,7 @@ compiler_test( size = "small", srcs = ["AliasOfProcessorTest.java"], compiler_deps = [ - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "//third_party/java/jsr330_inject", "//java/dagger/hilt/android:hilt_android_app", "//java/dagger/hilt/android/components", diff --git a/javatests/dagger/hilt/processor/internal/generatesrootinput/BUILD b/javatests/dagger/hilt/processor/internal/generatesrootinput/BUILD index ad919f59ed4..c697141e4a8 100644 --- a/javatests/dagger/hilt/processor/internal/generatesrootinput/BUILD +++ b/javatests/dagger/hilt/processor/internal/generatesrootinput/BUILD @@ -24,7 +24,7 @@ compiler_test( srcs = ["GeneratesRootInputProcessorTest.java"], compiler_deps = [ "//java/dagger/hilt:generates_root_input", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_annotation_annotation", ], deps = [ diff --git a/javatests/dagger/hilt/processor/internal/originatingelement/BUILD b/javatests/dagger/hilt/processor/internal/originatingelement/BUILD index 75f56ff612d..4a551f3ee8c 100644 --- a/javatests/dagger/hilt/processor/internal/originatingelement/BUILD +++ b/javatests/dagger/hilt/processor/internal/originatingelement/BUILD @@ -24,7 +24,7 @@ compiler_test( srcs = ["OriginatingElementProcessorTest.java"], compiler_deps = [ "//java/dagger/hilt/codegen:originating_element", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_annotation_annotation", ], deps = [ diff --git a/javatests/dagger/hilt/processor/internal/root/BUILD b/javatests/dagger/hilt/processor/internal/root/BUILD index bdc69dc514e..35efea54438 100644 --- a/javatests/dagger/hilt/processor/internal/root/BUILD +++ b/javatests/dagger/hilt/processor/internal/root/BUILD @@ -34,7 +34,7 @@ compiler_test( ":MyAppPreviousCompilation", "//java/dagger/hilt/android:hilt_android_app", "//java/dagger/hilt/android/testing:hilt_android_test", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_annotation_annotation", "@maven//:org_robolectric_robolectric", "@maven//:androidx_test_ext_junit", @@ -65,7 +65,7 @@ compiler_test( ":MyTestPreviousCompilation", "//java/dagger/hilt/android:hilt_android_app", "//java/dagger/hilt/android/testing:hilt_android_test", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_annotation_annotation", "@maven//:org_robolectric_robolectric", "@maven//:androidx_test_ext_junit", @@ -86,7 +86,7 @@ compiler_test( compiler_deps = [ "//java/dagger/hilt/android:hilt_android_app", "//java/dagger/hilt/android/testing:hilt_android_test", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_annotation_annotation", "@maven//:org_robolectric_robolectric", "@maven//:androidx_test_ext_junit", @@ -106,7 +106,7 @@ compiler_test( compiler_deps = [ "//java/dagger/hilt/android:hilt_android_app", "//java/dagger/hilt/android/testing:hilt_android_test", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_annotation_annotation", "@maven//:org_robolectric_robolectric", "@maven//:androidx_test_ext_junit", diff --git a/javatests/dagger/hilt/processor/internal/uninstallmodules/BUILD b/javatests/dagger/hilt/processor/internal/uninstallmodules/BUILD index 50ffd2e96b1..e1bd2fb28bf 100644 --- a/javatests/dagger/hilt/processor/internal/uninstallmodules/BUILD +++ b/javatests/dagger/hilt/processor/internal/uninstallmodules/BUILD @@ -27,7 +27,7 @@ compiler_test( "//java/dagger/hilt/android/testing:hilt_android_test", "//java/dagger/hilt/android/testing:uninstall_modules", "//java/dagger/hilt/migration:disable_install_in_check", - "@androidsdk//:platforms/android-32/android.jar", + "@androidsdk//:platforms/android-34/android.jar", "@maven//:androidx_annotation_annotation", ], deps = [