Internal changes
RELNOTES=N/A
PiperOrigin-RevId: 485386313
diff --git a/java/dagger/internal/codegen/writing/ExperimentalSwitchingProviderDependencyRepresentation.java b/java/dagger/internal/codegen/writing/ExperimentalSwitchingProviderDependencyRepresentation.java
index 93b4a79..e50f2d7 100644
--- a/java/dagger/internal/codegen/writing/ExperimentalSwitchingProviderDependencyRepresentation.java
+++ b/java/dagger/internal/codegen/writing/ExperimentalSwitchingProviderDependencyRepresentation.java
@@ -76,7 +76,8 @@
requestKind,
Expression.create(
frameworkType,
- CodeBlock.of("(($T) dependencies[$L])", frameworkType.getTypeName(), index)),
+ CodeBlock.of(
+ "(($T) dependencies[$L])", frameworkType.getRawType().getTypeName(), index)),
processingEnv);
if (usesExplicitTypeCast(expression, requestKind)) {
return expression.castTo(type);
diff --git a/test_defs.bzl b/test_defs.bzl
index 6155799..8fa13c5 100644
--- a/test_defs.bzl
+++ b/test_defs.bzl
@@ -15,7 +15,11 @@
"""This file defines constants useful across the Dagger tests."""
load("@rules_java//java:defs.bzl", "java_library", "java_test")
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library", "kt_jvm_test")
+load(
+ "@io_bazel_rules_kotlin//kotlin:kotlin.bzl",
+ "kt_jvm_library",
+ "kt_jvm_test",
+)
# Defines a set of build variants and the list of extra javacopts to build with.
# The key will be appended to the generated test names to ensure uniqueness.
@@ -175,6 +179,9 @@
if not test_only_deps:
test_only_deps = []
+ if not plugins:
+ plugins = []
+
test_deps = test_only_deps + deps
if supporting_files:
supporting_files_name = name + suffix + "_lib"
