From a8581e0a62b7cb3d1f5a13da26a8f40e22aad3d0 Mon Sep 17 00:00:00 2001
From: Eric Chang <erichang@google.com>
Date: Fri, 17 May 2024 15:03:22 -0700
Subject: Make dagger.internal.Provider extend jakarta.inject.Provider.

Issue #2058.

RELNOTES=Add a jakarta.inject.Provider runtime dependency in preparation for supporting Jakarta Providers
PiperOrigin-RevId: 634896178
---
 java/dagger/BUILD                  | 2 ++
 java/dagger/internal/Provider.java | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/dagger/BUILD b/java/dagger/BUILD
index 918340825..5572b503e 100644
--- a/java/dagger/BUILD
+++ b/java/dagger/BUILD
@@ -34,6 +34,7 @@ java_library(
     exports = ["//third_party/java/jsr330_inject"],
     deps = [
         "//third_party/java/jsr330_inject",
+        "@maven//:jakarta_inject_jakarta_inject_api",
     ],
 )
 
@@ -43,6 +44,7 @@ gen_maven_artifact(
     artifact_name = "Dagger",
     artifact_target = ":core",
     artifact_target_maven_deps = [
+        "jakarta.inject:jakarta.inject-api",
         "javax.inject:javax.inject",
     ],
     javadoc_root_packages = ["dagger"],
diff --git a/java/dagger/internal/Provider.java b/java/dagger/internal/Provider.java
index e38860187..45fe61740 100644
--- a/java/dagger/internal/Provider.java
+++ b/java/dagger/internal/Provider.java
@@ -20,6 +20,5 @@ package dagger.internal;
  * Internal Provider interface to make support for {@code javax.inject.Provider} and
  * {@code jakarta.inject.Provider} easier. Do not use outside of Dagger implementation code.
  */
-// TODO(erichang): Make this also extend the Jakarta Provider
-public interface Provider<T> extends javax.inject.Provider<T> {
+public interface Provider<T> extends javax.inject.Provider<T>, jakarta.inject.Provider<T> {
 }
-- 
cgit v1.2.3