From 85da48841e57f73b76416c18a22407ea2a222b66 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@squareup.com>
Date: Wed, 12 Aug 2020 12:49:49 -0400
Subject: [PATCH 1/2] JUnit 4.13 final

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b33d6e8f..6ea9b289 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
           'androidRuntimeJar': "com.google.dagger:dagger-android-jarimpl:${versions.dagger}",
           'androidCompiler': "com.google.dagger:dagger-android-processor:${versions.dagger}",
       ],
-      'junit': 'junit:junit:4.13-rc-2',
+      'junit': 'junit:junit:4.13',
       'truth': 'com.google.truth.extensions:truth-java8-extension:1.0',
       'compileTesting': 'com.google.testing.compile:compile-testing:0.18',
       'javaPoet': 'com.squareup:javapoet:1.11.1',

From 4709dc44a2946f37097b5b31b8d9ea2c00fc29b3 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@squareup.com>
Date: Wed, 12 Aug 2020 13:30:45 -0400
Subject: [PATCH 2/2] Update to Dagger 2.28.3

---
 build.gradle                                               | 2 +-
 .../android/src/main/java/com/example/ExampleActivity.java | 2 +-
 integration-tests/upstream/build.gradle                    | 7 +++++++
 integration-tests/upstream/dagger                          | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6ea9b289..71f4ab27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import net.ltgt.gradle.errorprone.CheckSeverity
 
 buildscript {
   ext.versions = [
-      'dagger': '2.25.2',
+      'dagger': '2.28.3',
       'incap': '0.2',
       'androidTools': '26.4.1',
   ]
diff --git a/integration-tests/android/src/main/java/com/example/ExampleActivity.java b/integration-tests/android/src/main/java/com/example/ExampleActivity.java
index a7b5b3bb..5ddcee62 100644
--- a/integration-tests/android/src/main/java/com/example/ExampleActivity.java
+++ b/integration-tests/android/src/main/java/com/example/ExampleActivity.java
@@ -3,9 +3,9 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import dagger.Module;
 import dagger.Provides;
 import dagger.android.AndroidInjection;
diff --git a/integration-tests/upstream/build.gradle b/integration-tests/upstream/build.gradle
index 454fc4c9..369f9792 100644
--- a/integration-tests/upstream/build.gradle
+++ b/integration-tests/upstream/build.gradle
@@ -8,6 +8,9 @@ sourceSets.test.java {
   exclude 'dagger/functional/tck/**'
   exclude 'dagger/functional/spi/**'
 
+  // TODO fix our build so these work
+  exclude 'dagger/functional/kotlin/**'
+
   // These tests contains a reference to a generated types directly.
   exclude 'dagger/functional/gwt/GwtIncompatiblesTest.java'
   exclude 'dagger/functional/membersinject/MembersInjectTest.java'
@@ -28,6 +31,10 @@ test.filter {
   // dagger-reflect does not produce the exact same behavior as dagger-compiler for @Reusable.
   excludeTest 'dagger.functional.ReusableTest', null
 
+  // Uses nested component interfaces which are not public and thus cannot be proxied.
+  excludeTest 'dagger.functional.ComponentDependenciesTest', 'testPolymorphicOverridesStillCompiles'
+  excludeTest 'dagger.functional.ComponentDependenciesTest', 'testSameMethodTwice'
+
   // TODO reflect bug! Need something like ByteBuddy for proxying classes at runtime.
   excludeTest 'dagger.functional.aot.PrunedFrameworkInstanceWithModuleInstanceTest', 'prunedBindingWithModuleInstance_doesntThrowDuringInitialization'
   excludeTest 'dagger.functional.builder.BuilderBindsInstanceParameterTest', null
diff --git a/integration-tests/upstream/dagger b/integration-tests/upstream/dagger
index 1514f964..38acce72 160000
--- a/integration-tests/upstream/dagger
+++ b/integration-tests/upstream/dagger
@@ -1 +1 @@
-Subproject commit 1514f964c162caa62fa83efefc318ef35ea0080d
+Subproject commit 38acce721827680eb6fdc8e5be4171f41f0aefb3