From 92872a61706ded80c63a6541b7fd1cd445b1d518 Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Wed, 22 Feb 2017 13:46:28 -0800 Subject: [PATCH] Run buck autodeps to fix CI --- src/com/facebook/buck/cli/BUCK.autodeps | 1 - src/com/facebook/buck/distributed/BUCK.autodeps | 2 +- src/com/facebook/buck/event/BUCK.autodeps | 3 +-- src/com/facebook/buck/jvm/java/intellij/BUCK.autodeps | 1 + src/com/facebook/buck/log/memory/BUCK.autodeps | 6 +----- src/com/facebook/buck/rules/args/BUCK.autodeps | 3 ++- src/com/facebook/buck/rules/macros/BUCK.autodeps | 3 ++- src/com/facebook/buck/util/network/BUCK.autodeps | 3 +-- test/com/facebook/buck/cli/BUCK.autodeps | 1 - test/com/facebook/buck/eden/cli/BUCK.autodeps | 2 +- test/com/facebook/buck/event/BUCK.autodeps | 3 --- test/com/facebook/buck/event/listener/BUCK.autodeps | 9 --------- .../com/facebook/buck/jvm/java/intellij/BUCK.autodeps | 1 + test/com/facebook/buck/jvm/kotlin/BUCK.autodeps | 11 +++++++++-- .../buck/jvm/kotlin/KotlinLibraryBuilder.java | 4 +--- test/com/facebook/buck/util/BUCK.autodeps | 1 + 16 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/com/facebook/buck/cli/BUCK.autodeps b/src/com/facebook/buck/cli/BUCK.autodeps index 3a21cbb2b15..63f6574f5b7 100644 --- a/src/com/facebook/buck/cli/BUCK.autodeps +++ b/src/com/facebook/buck/cli/BUCK.autodeps @@ -56,7 +56,6 @@ "//src/com/facebook/buck/util:object_mapper", "//src/com/facebook/buck/util:watchman", "//src/com/facebook/buck/util/network:network", - "//src/com/facebook/buck/util/network/offline:offline", "//src/com/facebook/buck/util/perf:perf", "//src/com/facebook/buck/util/shutdown:shutdown", "//src/com/facebook/buck/util/versioncontrol:impl", diff --git a/src/com/facebook/buck/distributed/BUCK.autodeps b/src/com/facebook/buck/distributed/BUCK.autodeps index ecbf3dd56d4..2c5d62ad9d9 100644 --- a/src/com/facebook/buck/distributed/BUCK.autodeps +++ b/src/com/facebook/buck/distributed/BUCK.autodeps @@ -8,6 +8,7 @@ "//src/com/facebook/buck/json:json", "//src/com/facebook/buck/jvm/java:config", "//src/com/facebook/buck/log:api", + "//src/com/facebook/buck/model:simple_types", "//src/com/facebook/buck/parser:rule_pattern", "//src/com/facebook/buck/rules:default_cell_path_resolver", "//src/com/facebook/buck/rules:interfaces", @@ -29,7 +30,6 @@ "//src/com/facebook/buck/hashing:hashing", "//src/com/facebook/buck/io:io", "//src/com/facebook/buck/model:model", - "//src/com/facebook/buck/model:simple_types", "//src/com/facebook/buck/parser:parser", "//src/com/facebook/buck/rules:action_graph_cache", "//src/com/facebook/buck/rules:build_rule", diff --git a/src/com/facebook/buck/event/BUCK.autodeps b/src/com/facebook/buck/event/BUCK.autodeps index d2eb7a5010e..75abb90a902 100644 --- a/src/com/facebook/buck/event/BUCK.autodeps +++ b/src/com/facebook/buck/event/BUCK.autodeps @@ -16,8 +16,7 @@ "//src/com/facebook/buck/timing:timing", "//src/com/facebook/buck/util/immutables:immutables", "//third-party/java/guava:guava", - "//third-party/java/jackson:jackson-annotations", - "//third-party/java/jackson:jackson-databind" + "//third-party/java/jackson:jackson-annotations" ] }, "interfaces" : { diff --git a/src/com/facebook/buck/jvm/java/intellij/BUCK.autodeps b/src/com/facebook/buck/jvm/java/intellij/BUCK.autodeps index 58194ba1b38..b4133d96189 100644 --- a/src/com/facebook/buck/jvm/java/intellij/BUCK.autodeps +++ b/src/com/facebook/buck/jvm/java/intellij/BUCK.autodeps @@ -11,6 +11,7 @@ "//src/com/facebook/buck/jvm/java:packagefinder", "//src/com/facebook/buck/jvm/java:rules", "//src/com/facebook/buck/jvm/java:support", + "//src/com/facebook/buck/jvm/kotlin:kotlin", "//src/com/facebook/buck/log:api", "//src/com/facebook/buck/shell:steps", "//src/com/facebook/buck/util:exceptions", diff --git a/src/com/facebook/buck/log/memory/BUCK.autodeps b/src/com/facebook/buck/log/memory/BUCK.autodeps index d7ff18517d3..8a0dd24832a 100644 --- a/src/com/facebook/buck/log/memory/BUCK.autodeps +++ b/src/com/facebook/buck/log/memory/BUCK.autodeps @@ -1,12 +1,8 @@ { "memory" : { "deps" : [ - "//src/com/facebook/buck/event/listener:listener", "//src/com/facebook/buck/log:api", - "//src/com/facebook/buck/log:log", - "//src/com/facebook/buck/util:object_mapper", - "//third-party/java/jackson:jackson-core", - "//third-party/java/jackson:jackson-databind" + "//src/com/facebook/buck/log:log" ], "exported_deps" : [ "//third-party/java/guava:guava" diff --git a/src/com/facebook/buck/rules/args/BUCK.autodeps b/src/com/facebook/buck/rules/args/BUCK.autodeps index 77806b56c0f..5b04e1db325 100644 --- a/src/com/facebook/buck/rules/args/BUCK.autodeps +++ b/src/com/facebook/buck/rules/args/BUCK.autodeps @@ -5,7 +5,8 @@ "//src/com/facebook/buck/shell:worker_tool", "//src/com/facebook/buck/util:exceptions", "//src/com/facebook/buck/util:util", - "//third-party/java/immutables:immutables" + "//third-party/java/immutables:immutables", + "//third-party/java/jsr:jsr305" ], "exported_deps" : [ "//src/com/facebook/buck/model:macros", diff --git a/src/com/facebook/buck/rules/macros/BUCK.autodeps b/src/com/facebook/buck/rules/macros/BUCK.autodeps index 2361893eb06..ccc36502c99 100644 --- a/src/com/facebook/buck/rules/macros/BUCK.autodeps +++ b/src/com/facebook/buck/rules/macros/BUCK.autodeps @@ -21,7 +21,8 @@ "//src/com/facebook/buck/util/environment:platform", "//src/com/facebook/buck/util/immutables:immutables", "//src/com/facebook/buck/versions:translator", - "//third-party/java/guava:guava" + "//third-party/java/guava:guava", + "//third-party/java/jsr:jsr305" ] }, "types" : { diff --git a/src/com/facebook/buck/util/network/BUCK.autodeps b/src/com/facebook/buck/util/network/BUCK.autodeps index 975052c5817..f7ade9e4263 100644 --- a/src/com/facebook/buck/util/network/BUCK.autodeps +++ b/src/com/facebook/buck/util/network/BUCK.autodeps @@ -2,8 +2,7 @@ "network" : { "deps" : [ "//src/com/facebook/buck/log:api", - "//src/com/facebook/buck/util:util", - "//src/com/facebook/buck/util/concurrent:concurrent" + "//src/com/facebook/buck/util:util" ], "exported_deps" : [ "//src-gen:thrift", diff --git a/test/com/facebook/buck/cli/BUCK.autodeps b/test/com/facebook/buck/cli/BUCK.autodeps index ef97c610159..50671c83126 100644 --- a/test/com/facebook/buck/cli/BUCK.autodeps +++ b/test/com/facebook/buck/cli/BUCK.autodeps @@ -97,7 +97,6 @@ "//third-party/java/hamcrest:java-hamcrest", "//third-party/java/jackson:jackson-core", "//third-party/java/jackson:jackson-databind", - "//third-party/java/jsr:jsr305", "//third-party/java/junit:junit" ], "exported_deps" : [ ] diff --git a/test/com/facebook/buck/eden/cli/BUCK.autodeps b/test/com/facebook/buck/eden/cli/BUCK.autodeps index be45acf359c..36c78fcd6de 100644 --- a/test/com/facebook/buck/eden/cli/BUCK.autodeps +++ b/test/com/facebook/buck/eden/cli/BUCK.autodeps @@ -1,11 +1,11 @@ { "cli" : { "deps" : [ - "//src/com/facebook/buck/eden:eden", "//src/com/facebook/buck/util/sha1:sha1", "//third-party/java/guava:guava" ], "exported_deps" : [ + "//src/com/facebook/buck/eden:eden", "//third-party/java/args4j:args4j", "//third-party/java/infer-annotations:infer-annotations" ] diff --git a/test/com/facebook/buck/event/BUCK.autodeps b/test/com/facebook/buck/event/BUCK.autodeps index 4fb13737df6..9f50f60bb2a 100644 --- a/test/com/facebook/buck/event/BUCK.autodeps +++ b/test/com/facebook/buck/event/BUCK.autodeps @@ -12,7 +12,6 @@ "//src/com/facebook/buck/rules:rules", "//src/com/facebook/buck/test/selectors:selectors", "//src/com/facebook/buck/timing:timing", - "//src/com/facebook/buck/util:object_mapper", "//test/com/facebook/buck/event:testutil", "//test/com/facebook/buck/model:testutil", "//test/com/facebook/buck/rules:testutil", @@ -21,9 +20,7 @@ "//test/com/facebook/buck/timing:testutil", "//third-party/java/guava:guava", "//third-party/java/hamcrest:java-hamcrest", - "//third-party/java/jackson:jackson-core", "//third-party/java/jackson:jackson-databind", - "//third-party/java/jackson:jackson-datatype-guava", "//third-party/java/junit:junit" ], "exported_deps" : [ ] diff --git a/test/com/facebook/buck/event/listener/BUCK.autodeps b/test/com/facebook/buck/event/listener/BUCK.autodeps index 2c42b393923..4e1a6a3c94a 100644 --- a/test/com/facebook/buck/event/listener/BUCK.autodeps +++ b/test/com/facebook/buck/event/listener/BUCK.autodeps @@ -2,10 +2,8 @@ "listener" : { "deps" : [ "//src-gen:thrift", - "//src/com/facebook/buck/android:steps", "//src/com/facebook/buck/artifact_cache:artifact_cache", "//src/com/facebook/buck/cli:config", - "//src/com/facebook/buck/config:config", "//src/com/facebook/buck/counters:counters", "//src/com/facebook/buck/distributed:distributed", "//src/com/facebook/buck/event:event", @@ -39,15 +37,10 @@ "//src/com/facebook/buck/util/autosparse:autosparse", "//src/com/facebook/buck/util/concurrent:concurrent", "//src/com/facebook/buck/util/environment:environment", - "//src/com/facebook/buck/util/environment:platform", "//src/com/facebook/buck/util/network:network", - "//src/com/facebook/buck/util/network/offline:offline", "//src/com/facebook/buck/util/perf:perf", "//src/com/facebook/buck/util/unit:unit", - "//src/com/facebook/buck/util/versioncontrol:versioncontrol", - "//src/com/facebook/buck/util/versioncontrol:versioncontrol_generator", "//test/com/facebook/buck/cli:FakeBuckConfig", - "//test/com/facebook/buck/config:testutil", "//test/com/facebook/buck/event:testutil", "//test/com/facebook/buck/event/listener:testutil", "//test/com/facebook/buck/model:testutil", @@ -57,8 +50,6 @@ "//test/com/facebook/buck/testutil:testutil", "//test/com/facebook/buck/testutil/integration:util", "//test/com/facebook/buck/timing:testutil", - "//test/com/facebook/buck/util/environment:testutil", - "//test/com/facebook/buck/util/network:testutil", "//third-party/java/easymock:easymock", "//third-party/java/gson:gson", "//third-party/java/guava:guava", diff --git a/test/com/facebook/buck/jvm/java/intellij/BUCK.autodeps b/test/com/facebook/buck/jvm/java/intellij/BUCK.autodeps index 26f7fa82797..0ac2f392e3f 100644 --- a/test/com/facebook/buck/jvm/java/intellij/BUCK.autodeps +++ b/test/com/facebook/buck/jvm/java/intellij/BUCK.autodeps @@ -26,6 +26,7 @@ "//test/com/facebook/buck/jvm/java:fakepackagefinder", "//test/com/facebook/buck/jvm/java:javac-env", "//test/com/facebook/buck/jvm/java:testutil", + "//test/com/facebook/buck/jvm/kotlin:testutil", "//test/com/facebook/buck/model:testutil", "//test/com/facebook/buck/rules:testutil", "//test/com/facebook/buck/shell:testutil", diff --git a/test/com/facebook/buck/jvm/kotlin/BUCK.autodeps b/test/com/facebook/buck/jvm/kotlin/BUCK.autodeps index 70b28495d3a..9423a8af76e 100644 --- a/test/com/facebook/buck/jvm/kotlin/BUCK.autodeps +++ b/test/com/facebook/buck/jvm/kotlin/BUCK.autodeps @@ -17,12 +17,19 @@ }, "testutil" : { "deps" : [ - "//src/com/facebook/buck/jvm/kotlin:kotlin", "//src/com/facebook/buck/util:exceptions", "//src/com/facebook/buck/util/environment:platform", "//test/com/facebook/buck/cli:FakeBuckConfig", + "//test/com/facebook/buck/testutil:testutil", "//third-party/java/junit:junit" ], - "exported_deps" : [ ] + "exported_deps" : [ + "//src/com/facebook/buck/io:io", + "//src/com/facebook/buck/jvm/kotlin:kotlin", + "//src/com/facebook/buck/model:model", + "//src/com/facebook/buck/rules:build_rule", + "//test/com/facebook/buck/rules:testutil", + "//third-party/java/guava:guava" + ] } } diff --git a/test/com/facebook/buck/jvm/kotlin/KotlinLibraryBuilder.java b/test/com/facebook/buck/jvm/kotlin/KotlinLibraryBuilder.java index 47ccfbc539e..d8bad5fa052 100644 --- a/test/com/facebook/buck/jvm/kotlin/KotlinLibraryBuilder.java +++ b/test/com/facebook/buck/jvm/kotlin/KotlinLibraryBuilder.java @@ -16,8 +16,6 @@ package com.facebook.buck.jvm.kotlin; -import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC_OPTIONS; - import com.facebook.buck.io.ProjectFilesystem; import com.facebook.buck.model.BuildTarget; import com.facebook.buck.rules.AbstractNodeBuilder; @@ -39,7 +37,7 @@ protected KotlinLibraryBuilder( ProjectFilesystem projectFilesystem, HashCode hashCode) { super( - new KotlinLibraryDescription(null, DEFAULT_JAVAC_OPTIONS), + new KotlinLibraryDescription(null, null), target, projectFilesystem, hashCode); diff --git a/test/com/facebook/buck/util/BUCK.autodeps b/test/com/facebook/buck/util/BUCK.autodeps index d9d081d569d..a5a65364f4f 100644 --- a/test/com/facebook/buck/util/BUCK.autodeps +++ b/test/com/facebook/buck/util/BUCK.autodeps @@ -20,6 +20,7 @@ "util" : { "deps" : [ "//src/com/facebook/buck/event:event", + "//src/com/facebook/buck/event:interfaces", "//src/com/facebook/buck/io:MorePaths.java", "//src/com/facebook/buck/io:io", "//src/com/facebook/buck/io:watchman",