Skip to content

Commit

Permalink
Merge pull request square#190 from tbroyer/doc-usage
Browse files Browse the repository at this point in the history
Move dagger-compiler as a m-compiler-p dependency.
  • Loading branch information
swankjesse committed Mar 24, 2013
2 parents 8ca183a + 2014bce commit 3b8ce02
Show file tree
Hide file tree
Showing 16 changed files with 189 additions and 97 deletions.
21 changes: 14 additions & 7 deletions compiler/src/it/cyclic-deps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
10 changes: 5 additions & 5 deletions compiler/src/it/cyclic-deps/src/main/java/test/TestApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import dagger.Provides;
import javax.inject.Inject;

class TestApp implements Runnable {
class TestApp {

static class Foo {
@Inject Foo(@SuppressWarnings("unused") Bar b) { }
Expand Down Expand Up @@ -50,9 +50,9 @@ static class C { }
static class D { }
@Module(entryPoints = D.class)
static class CyclicModule {
@Provides A a(@SuppressWarnings("unused") D d) { }
@Provides B b(@SuppressWarnings("unused") A a) { }
@Provides C c(@SuppressWarnings("unused") B b) { }
@Provides D d(@SuppressWarnings("unused") C c) { }
@Provides A a(@SuppressWarnings("unused") D d) { return null; }
@Provides B b(@SuppressWarnings("unused") A a) { return null; }
@Provides C c(@SuppressWarnings("unused") B b) { return null; }
@Provides D d(@SuppressWarnings("unused") C c) { return null; }
}
}
21 changes: 14 additions & 7 deletions compiler/src/it/default-package-injected-type/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 14 additions & 7 deletions compiler/src/it/extension-graph/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 14 additions & 7 deletions compiler/src/it/include-non-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 14 additions & 7 deletions compiler/src/it/inject-parameterized-type/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 14 additions & 7 deletions compiler/src/it/inner-classes-complaint-injection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 14 additions & 7 deletions compiler/src/it/missing-at-inject-constructor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 14 additions & 7 deletions compiler/src/it/multiple-provides-methods/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 14 additions & 7 deletions compiler/src/it/provides-method-with-throws-clause/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
21 changes: 14 additions & 7 deletions compiler/src/it/same-provides-method-name/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,25 @@
<artifactId>dagger</artifactId>
<version>@dagger.version@</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
<optional>true</optional>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
23 changes: 15 additions & 8 deletions compiler/src/it/simple-missing-dependency-failure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,27 @@
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>${project.version}</version>
<optional>true</optional>
<version>@dagger.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration><source>1.5</source><target>1.5</target></configuration>
<version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<!-- workaround for http://jira.codehaus.org/browse/MCOMPILER-202 -->
<forceJavacCompilerUse>true</forceJavacCompilerUse>
</configuration>
<dependencies>
<dependency>
<groupId>@dagger.groupId@</groupId>
<artifactId>dagger-compiler</artifactId>
<version>@dagger.version@</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down
Loading

0 comments on commit 3b8ce02

Please sign in to comment.