Merge pull request #199 from JakeWharton/jw/latest-dagger/2020-08-12

Dagger 2.28.3

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',
   ]
@@ -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',

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;

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