Merge from moe writing branch from 9f986abd0f985e717dde1476aeaf058df50064ff

.travis.yml

@@ -6,8 +6,8 @@ jdk:
 
 android:
   components:
-    - build-tools-20.0.0
-    - android-16
+    - build-tools-23.0.0
+    - android-23
   licenses:
     - android-sdk-license-5be876d5
 

CHANGELOG.md

@@ -1,8 +1,58 @@
 Change Log
 ==========
 
-Version 1.2.0 *(2013-12-13)*
-----------------------------
+Dagger 2 (Components)
+---------------------
+
+### Version 2.0.2 *(2015-11-03)*
+
+A patch release, most crucially including:
+
+  * A fix to the way processor validation of types is done that permits dagger to play
+    more nicely with other processors, avoiding over-validating aspects that it doesn't
+    need, which may yet not have been generated by other processors in a different round
+    of processing.
+  * Some improved error reporting for edge-cases
+  * Fix to prevent incompatible versions of Guava on the classpath from blowing up processing
+  * Support a more robust set of types for map keys in map bindings (primitive types, etc.)
+
+### Version 2.0.1 *(2015-05-28)*
+
+A maintenance release fixing immediate issues following the Dagger 2.0 release, including:
+
+  * Speed up Graph Validation (reduce build times by 10s of seconds on sampled large projects)
+  * Generate correct code for @MapKey annotation types (beta)
+  * Fix to properly emit code for class literal values in @MapKey annotations.
+  * Fix for injecting component dependencies
+  * Fixes to generated code to account for differences in generics handling in ecg vs. javac.
+  * Subcomponents can now be abstract classes.
+  * Subcomponents now properly build the object graph in some cases involving explicit bindings
+    and (sub)components without scope.
+  * Improve runtime performance of SetFactory (set multibindings)
+  * Other smaller fixes, refactorings, etc.
+
+### Version 2.0.0 *(2015-04-21)*
+
+The initial release of the 2.0 code-line, supporting:
+
+  * `@Component` interfaces representing a custom API to access a graph of objects
+  * JSR-330 injection automation using `@Inject` signals, `@Qualifiers`
+  * Simple bindings of implementations to interfaces, custom provision of objects, and set-bindings
+  * Compile-time validation of graph structure (cycles, missing bindings, duplicate bindings)
+  * Generation of 
+    - backing implementations for components
+    - factories for `@Inject` constructors and modules
+    - members-injectors for `@Inject` methods and fields
+  * Beta support for
+    - Map bindings
+    - [Producers](http://google.github.io/dagger/api/latest/dagger/producers/Producer.html)
+
+==============================================================
+
+Dagger 1 (ObjectGraph)
+----------------------
+
+### Version 1.2.0 *(2013-12-13)*
 
  * Numerous performance improvements in both the compiler and runtime.
    * Use more efficient `String` concatenation.
@@ -15,8 +65,7 @@ Version 1.2.0 *(2013-12-13)*
    module adapters.
 
 
-Version 1.1.0 *(2013-08-05)*
-----------------------------
+### Version 1.1.0 *(2013-08-05)*
 
  * Module loading now requires code generation via the 'dagger-compiler' artifact.
  * Allow multiple contributions to Set binding via `Provides.Type.SET_VALUES`.
@@ -27,14 +76,12 @@ Version 1.1.0 *(2013-08-05)*
  * Update JavaWriter to 2.1.1.
 
 
-Version 1.0.1 *(2013-06-03)*
-----------------------------
+### Version 1.0.1 *(2013-06-03)*
 
  * Explicitly forbid declaring `@Inject` on a class type (e.g., `@Inject class Foo {}`).
  * Update JavaWriter to 1.0.5.
 
 
-Version 1.0.0 *(2013-05-07)*
-----------------------------
+### Version 1.0.0 *(2013-05-07)*
 
 Initial release.

compiler/pom.xml

@@ -46,25 +46,27 @@
       <artifactId>auto-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.auto.service</groupId>
-      <artifactId>auto-service</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
       <optional>true</optional>
     </dependency>
-    <!-- TODO(gak): Restore this presumably as javapoet when appropriate.
     <dependency>
-      <groupId>com.squareup</groupId>
-      <artifactId>javawriter</artifactId>
+      <groupId>com.google.googlejavaformat</groupId>
+      <artifactId>google-java-format</artifactId>
     </dependency>
-    -->
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
+      <groupId>com.google.auto.service</groupId>
+      <artifactId>auto-service</artifactId>
+      <scope>provided</scope> <!-- to leave out of the all-deps jar -->
     </dependency>
-
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <optional>true</optional>
+      <scope>provided</scope> <!-- to leave out of the all-deps jar -->
       <version>1.0</version>
     </dependency>
 
@@ -187,6 +189,16 @@
                   <shadedPattern>dagger.shaded.auto.common</shadedPattern>
                 </relocation>
               </relocations>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
             </configuration>
           </execution>
         </executions>

compiler/src/it/functional-tests/pom.xml

@@ -28,6 +28,10 @@ limitations under the License.
   <artifactId>functional-tests</artifactId>
   <name>Functional Tests</name>
   <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.dagger</groupId>
       <artifactId>dagger</artifactId>
@@ -39,19 +43,23 @@ limitations under the License.
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject-tck</artifactId>
+    </dependency>
     <dependency>
       <!-- For map-bindings -->
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
       <version>${auto.value.version}</version>
-      <optional>true</optional>
+      <scope>provided</scope> <!-- to leave out of the all-deps jar -->
     </dependency>
     <dependency>
       <!-- For map-bindings -->
       <groupId>com.google.auto.factory</groupId>
       <artifactId>auto-factory</artifactId>
       <version>${auto.factory.version}</version>
-      <optional>true</optional>
+      <scope>provided</scope> <!-- to leave out of the all-deps jar -->
     </dependency>
 
     <dependency>

compiler/src/it/functional-tests/src/main/java/test/TestBooleanKey.java → compiler/src/it/functional-tests/src/main/java/test/BooleanKey.java

@@ -18,6 +18,6 @@
 import dagger.MapKey;
 
 @MapKey(unwrapValue = true)
-@interface TestBooleanKey {
+@interface BooleanKey {
   boolean value();
 }

compiler/src/it/functional-tests/src/main/java/test/TestByteKey.java → compiler/src/it/functional-tests/src/main/java/test/ByteKey.java

@@ -18,6 +18,6 @@
 import dagger.MapKey;
 
 @MapKey(unwrapValue = true)
-@interface TestByteKey {
+@interface ByteKey {
   byte value();
 }

compiler/src/it/functional-tests/src/main/java/test/TestCharKey.java → compiler/src/it/functional-tests/src/main/java/test/CharKey.java

@@ -18,6 +18,6 @@
 import dagger.MapKey;
 
 @MapKey(unwrapValue = true)
-@interface TestCharKey {
+@interface CharKey {
   char value();
 }

compiler/src/it/functional-tests/src/main/java/test/ComponentSupertypeDependsOnGeneratedCode.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2015 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test;
+
+import dagger.Component;
+
+@Component
+interface ComponentSupertypeDependsOnGeneratedCode
+    extends ComponentSupertypeDependsOnGeneratedCodeInterface {}

compiler/src/it/functional-tests/src/main/java/test/ComponentSupertypeDependsOnGeneratedCodeInterface.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2015 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package test;
+
+interface ComponentSupertypeDependsOnGeneratedCodeInterface {
+  NeedsFactory_SomethingFactory somethingFactory();
+}

compiler/src/it/functional-tests/src/main/java/test/MultibindingComponent.java

@@ -16,9 +16,11 @@
 package test;
 
 import dagger.Component;
+import dagger.mapkeys.StringKey;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
+import javax.inject.Named;
 import javax.inject.Provider;
 import test.sub.ContributionsModule;
 
@@ -31,11 +33,12 @@
 )
 interface MultibindingComponent {
   Map<String, String> map();
+  Map<String, String[]> mapOfArrays();
   Map<String, Provider<String>> mapOfProviders();
   Set<String> mapKeys();
   Collection<String> mapValues();
   Set<Integer> set();
-  Map<TestStringKey.NestedWrappedKey, String> nestedKeyMap();
+  Map<NestedAnnotationContainer.NestedWrappedKey, String> nestedKeyMap();
   Map<Class<? extends Number>, String> numberClassKeyMap();
   Map<Class<?>, String> classKeyMap();
   Map<Long, String> longKeyMap();
@@ -44,6 +47,7 @@ interface MultibindingComponent {
   Map<Byte, String> byteKeyMap();
   Map<Boolean, String> booleanKeyMap();
   Map<Character, String> characterKeyMap();
-  Map<TestStringKey, String> unwrappedAnnotationKeyMap();
-  Map<TestWrappedAnnotationKey, String> wrappedAnnotationKeyMap();
+  Map<StringKey, String> unwrappedAnnotationKeyMap();
+  Map<WrappedAnnotationKey, String> wrappedAnnotationKeyMap();
+  @Named("complexQualifier") Set<String> complexQualifierStringSet();
 }