diff --git a/.travis.yml b/.travis.yml index e7626a7f50e..621d4eac776 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,12 +36,7 @@ before_install: - export PATH=$M2_HOME/bin:$PATH - mvn --version -install: - - mvn -B -P!standard-with-extra-repos -U install clean --fail-never --quiet -DskipTests=true -Dinvoker.skip=true - -script: - - bazel test --test_output errors //... - - mvn -B -P!standard-with-extra-repos -U verify --fail-at-end -Dsource.skip=true -Dmaven.javadoc.skip=true +script: bazel test --test_output errors //... env: global: @@ -61,4 +56,4 @@ branches: cache: directories: - - $HOME/.m2 + - $HOME/.cache/bazel diff --git a/compiler/pom.xml b/compiler/pom.xml deleted file mode 100644 index 1a7ab7df3a5..00000000000 --- a/compiler/pom.xml +++ /dev/null @@ -1,224 +0,0 @@ - - - - 4.0.0 - - - com.google.dagger - dagger-parent - HEAD-SNAPSHOT - - - dagger-compiler - Dagger Compiler - - Tools to generate Dagger injection and module adapters from annotated code and validate them. - - - - - ${project.groupId} - dagger - ${project.version} - - - ${project.groupId} - dagger-producers - ${project.version} - - - com.google.auto - auto-common - - - com.google.errorprone - error_prone_annotations - - - com.google.guava - guava - - - com.google.code.findbugs - jsr305 - true - - - com.google.googlejavaformat - google-java-format - - - com.google.auto.service - auto-service - provided - - - com.google.auto.value - auto-value - provided - - - junit - junit - test - - - ${project.groupId} - dagger - tests - ${project.version} - test - - - com.google.testing.compile - compile-testing - test - - - com.google.guava - guava-testlib - test - - - com.squareup - javapoet - - - org.mockito - mockito-core - test - - - com.google.truth - truth - test - - - - - - - maven-compiler-plugin - - 1.8 - 1.8 - -Xlint:all - true - true - - - - default-compile - compile - - - com.google.auto.value.processor.AutoValueProcessor - com.google.auto.service.processor.AutoServiceProcessor - - - - - default-test-compile - testCompile - - - dagger.internal.codegen.ComponentProcessor - - - - - - - maven-invoker-plugin - - true - ${project.build.directory}/it - true - - !sonatype-oss-release - - - */pom.xml - - ${project.build.directory}/it-repo - true - - - - integration-test - - install - run - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - package - - shade - - - true - - - - com.google.guava - - com.google.auto.service - com.google.auto.value - - com.google.dagger:dagger - com.google.dagger:dagger-producers - javax.inject - - - - - com.google.auto.common - dagger.shaded.auto.common - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - com.google.errorprone:javac - - ** - - - - - - - - - - diff --git a/compiler/src/it/functional-tests/pom.xml b/compiler/src/it/functional-tests/pom.xml deleted file mode 100644 index 9bf20565a97..00000000000 --- a/compiler/src/it/functional-tests/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - 4.0.0 - - com.google.dagger - dagger-parent - HEAD-SNAPSHOT - - dagger.tests - functional-tests - Functional Tests - - - com.google.dagger - dagger - ${project.version} - - - com.google.dagger - dagger-compiler - ${project.version} - true - - - javax.inject - javax.inject-tck - - - com.google.auto.value - auto-value - provided - - - com.google.auto.factory - auto-factory - provided - - - - junit - junit - test - - - com.google.truth - truth - test - - - com.google.guava - guava-testlib - test - - - - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - diff --git a/compiler/src/it/functional-tests/src/main/java/test/ReleasableReferencesComponents.java b/compiler/src/it/functional-tests/src/main/java/test/ReleasableReferencesComponents.java index 84b1bb1e49d..597b91fdf00 100644 --- a/compiler/src/it/functional-tests/src/main/java/test/ReleasableReferencesComponents.java +++ b/compiler/src/it/functional-tests/src/main/java/test/ReleasableReferencesComponents.java @@ -19,6 +19,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import static test.ReleasableReferencesComponents.Thing.thing; +import com.google.auto.value.AutoValue; import dagger.Component; import dagger.Module; import dagger.Provides; @@ -82,10 +83,7 @@ interface Parent extends ThingComponent { Child child(); } - // TODO(ronshapiro): investigate the maven-compiler-plugin bug that is blocking javac from - // recognizing @AutoValue when it is imported instead of fully-qualified - // http://bugs.java.com/view_bug.do?bug_id=7101822 - @com.google.auto.value.AutoValue + @AutoValue abstract static class Thing { abstract int count(); diff --git a/compiler/src/it/guava-functional-tests/pom.xml b/compiler/src/it/guava-functional-tests/pom.xml deleted file mode 100644 index 6bf0fc074f2..00000000000 --- a/compiler/src/it/guava-functional-tests/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - com.google.dagger - dagger-parent - HEAD-SNAPSHOT - - dagger.tests - guava-functional-tests - Guava Functional Tests - - - com.google.dagger - dagger - ${project.version} - - - com.google.dagger - dagger-compiler - ${project.version} - true - - - com.google.auto.value - auto-value - provided - - - com.google.auto.factory - auto-factory - provided - - - - junit - junit - test - - - com.google.truth - truth - test - - - - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - diff --git a/compiler/src/it/producers-functional-tests/pom.xml b/compiler/src/it/producers-functional-tests/pom.xml deleted file mode 100644 index 0bf75f6a730..00000000000 --- a/compiler/src/it/producers-functional-tests/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - 4.0.0 - - com.google.dagger - dagger-parent - HEAD-SNAPSHOT - - dagger.tests - producers-functional-tests - Producers Functional Tests - - - com.google.guava - guava - - - com.google.dagger - dagger - ${project.version} - - - com.google.dagger - dagger-producers - ${project.version} - - - com.google.dagger - dagger-compiler - ${project.version} - true - - - com.google.auto.value - auto-value - provided - - - junit - junit - test - - - com.google.truth - truth - test - - - org.mockito - mockito-core - test - - - - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - diff --git a/compiler/src/it/tck/pom.xml b/compiler/src/it/tck/pom.xml deleted file mode 100644 index 0bc1b455fd8..00000000000 --- a/compiler/src/it/tck/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - 4.0.0 - - com.google.dagger - dagger-parent - HEAD-SNAPSHOT - - dagger.tests - tck - TCK - - - com.google.dagger - dagger - ${project.version} - - - com.google.dagger - dagger-compiler - ${project.version} - true - - - javax.inject - javax.inject-tck - - - - junit - junit - test - - - - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - -Adagger.privateMemberValidation=warning - -Adagger.staticMemberValidation=warning - -Adagger.ignorePrivateAndStaticInjectionForComponent=enabled - - - - - - diff --git a/core/pom.xml b/core/pom.xml deleted file mode 100644 index 4641a5f5c9d..00000000000 --- a/core/pom.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - 4.0.0 - - - com.google.dagger - dagger-parent - HEAD-SNAPSHOT - - - dagger - Dagger - - - - javax.inject - javax.inject - - - - com.google.guava - guava - test - - - junit - junit - test - - - com.google.truth - truth - test - - - - - - - maven-compiler-plugin - - -Xlint:all - true - true - - - - default-compile - - compile - - - 1.7 - 1.7 - - - - default-testCompile - - testCompile - - - 1.8 - 1.8 - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.8 - - - sniff-api - check - - - - - org.codehaus.mojo.signature - java16 - 1.0 - - - - - maven-javadoc-plugin - - dagger.internal:dagger.internal.* - - - - maven-source-plugin - - - attach-sources - generate-resources - - jar-no-fork - - - - - - maven-jar-plugin - - - - test-jar - - - - - - - diff --git a/gwt/pom.xml b/gwt/pom.xml deleted file mode 100644 index a182efe6437..00000000000 --- a/gwt/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - - com.google.dagger - dagger-parent - HEAD-SNAPSHOT - - - dagger-gwt - Dagger GWT integration - - - - ${project.groupId} - dagger - ${project.version} - - - ${project.groupId} - dagger - sources - ${project.version} - - - javax.inject - javax.inject - sources - - - diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 8c7a198f3a0..00000000000 --- a/pom.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - 4.0.0 - - - org.sonatype.oss - oss-parent - 7 - - - com.google.dagger - dagger-parent - pom - HEAD-SNAPSHOT - Dagger (Parent) - A fast dependency injector for Android and Java. - https://github.com/google/dagger - - - compiler - core - gwt - - producers - - - - UTF-8 - 24.2.0 - 25 - - - - http://github.com/google/dagger/ - scm:git:git://github.com/google/dagger.git - scm:git:ssh://git@github.com/google/dagger.git - HEAD - - - - GitHub Issues - http://github.com/google/dagger/issues - - - - - Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Google, Inc. - http://www.google.com - - - - - - javax.inject - javax.inject - 1 - - - javax.inject - javax.inject - sources - 1 - - - javax.inject - javax.inject-tck - 1 - - - com.google.code.findbugs - jsr305 - 3.0.1 - - - com.google.guava - guava - 20.0-rc1 - - - com.google.guava - guava-testlib - 20.0-rc1 - - - com.google.googlejavaformat - google-java-format - 1.3 - - - com.google.auto - auto-common - 0.8 - - - com.google.auto.factory - auto-factory - 1.0-beta3 - - - com.google.auto.service - auto-service - 1.0-rc2 - - - com.google.auto.value - auto-value - 1.4-rc1 - - - com.google.errorprone - error_prone_annotations - 2.0.12 - - - junit - junit - 4.11 - - - com.google.testing.compile - compile-testing - 0.10 - - - org.mockito - mockito-core - 1.9.5 - - - com.google.truth - truth - 0.30 - - - com.squareup - javapoet - 1.7.0 - - - - - - - - - maven-invoker-plugin - 1.7 - - - maven-compiler-plugin - 3.1 - - - maven-jar-plugin - 2.5 - - - - - - - maven-compiler-plugin - - 1.7 - 1.7 - -Xlint:all - true - true - - - - - maven-release-plugin - 2.3.2 - - true - - - - - maven-javadoc-plugin - 2.10.4 - - Dagger Dependency Injection ${project.version} API - Dagger Dependency Injection ${project.version} API - true - -Xdoclint:html,reference,syntax - - - - - - - - - examples - - true - - - core - compiler - gwt - examples - producers - - - - diff --git a/producers/pom.xml b/producers/pom.xml deleted file mode 100644 index 67aafefd6ea..00000000000 --- a/producers/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - 4.0.0 - - - com.google.dagger - dagger-parent - HEAD-SNAPSHOT - - - dagger-producers - Dagger Production Graphs - - An asynchronous dependency injection system that extends JSR-330. - - - - - ${project.groupId} - dagger - ${project.version} - - - com.google.code.findbugs - jsr305 - true - - - com.google.guava - guava - - - junit - junit - test - - - com.google.truth - truth - test - - - com.google.guava - guava-testlib - test - - - org.mockito - mockito-core - test - - -