Skip to content

Commit

Permalink
Update bazel deps (bazelbuild#95)
Browse files Browse the repository at this point in the history
update bazel-deps
  • Loading branch information
hsyed authored Jul 11, 2018
1 parent a8e29cc commit 4184f41
Show file tree
Hide file tree
Showing 23 changed files with 166 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .bazelproject
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ directories:
targets:
-//docs/...
//kotlin/builder:for_ide
//:all_tests
//:all_local_tests
//examples/...

test_sources:
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ skydoc_repositories()

http_jar(
name = "bazel_deps",
url = "https://github.com/axsy-dev/bazel-deps/releases/download/2/bazel-deps.jar",
sha256 = "bbd51188141f2bb09222a35675af25edbbb5b6507d779acb6c70c19e51cd67bd",
url = "https://github.com/hsyed/bazel-deps/releases/download/v0.1.0/parseproject_deploy.jar",
sha256 = "05498224710808be9687f5b9a906d11dd29ad592020246d4cd1a26eeaed0735e",
)

load("//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
Expand Down
8 changes: 8 additions & 0 deletions scripts/bazel_from_source
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@ function _main {
_build)
_build_head_bazel
;;
_cd)
cd ${BAZEL_SOURCE}
;;
_pull)
pushd ${BAZEL_SOURCE}
git fetch
git pull origin master
;;
*)
_head_bazel ${CMD} $@
;;
Expand Down
1 change: 0 additions & 1 deletion tests/integrationtests/jvm/kapt/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ java_plugin(
deps = [
"//third_party/jvm/com/google/auto/service:auto_service",
"//third_party/jvm/com/google/guava",
"//third_party/jvm/com/google/auto:auto_common"
],
processor_class = "com.google.auto.service.processor.AutoServiceProcessor",
generates_api = 0
Expand Down
4 changes: 2 additions & 2 deletions tests/rules/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
load("//kotlin:kotlin.bzl", "kt_jvm_test")

_TEST_COMMON_DEPS=[
TEST_COMMON_DEPS=[
"//tests/rules:assertion_test_case",
"//third_party/jvm/com/google/truth",
"//third_party/jvm/junit:junit"
Expand All @@ -26,7 +26,7 @@ def kt_it_assertion_test(name, test_class, cases=None, data = [], deps=[]):
kt_jvm_test(
name=name,
srcs=["%s.kt" % parts[len(parts)-1]],
deps = _TEST_COMMON_DEPS + deps,
deps = TEST_COMMON_DEPS + deps,
test_class=test_class,
data=data,
visibility=["//visibility:private"]
Expand Down
10 changes: 9 additions & 1 deletion third_party/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ options:
namePrefix: "io_bazel_rules_kotlin_"

dependencies:
junit:
junit:
lang: "java"
version: "4.12"
com.google.inject:
guice:
lang: "java"
Expand All @@ -19,7 +23,7 @@ dependencies:
protobuf:
modules: ["java", "java-util"]
lang: "java"
version: "3.5.1"
version: "3.6.0"
com.google.code.gson:
gson:
lang: "java"
Expand All @@ -45,6 +49,10 @@ dependencies:
modules: ["", "compiler", "producers"]
lang: "java"
version: "2.16"
javax.inject:
javax.inject:
lang: "java"
version: "1"
org.jetbrains.kotlinx:
kotlinx-coroutines:
modules: ["core"]
Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/aopalliance/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_aopalliance/aopalliance"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
5 changes: 4 additions & 1 deletion third_party/jvm/com/google/auto/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ java_library(
exports = [
"//external:jar/io_bazel_rules_kotlin_com/google/auto/auto_common"
],
runtime_deps = [
"//third_party/jvm/com/google/guava:guava"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/com/google/code/findbugs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_com/google/code/findbugs/jsr305"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
8 changes: 7 additions & 1 deletion third_party/jvm/com/google/dagger/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,14 @@ java_library(
exports = [
"//external:jar/io_bazel_rules_kotlin_com/google/dagger/dagger_spi"
],
runtime_deps = [
"//third_party/jvm/com/google/guava:guava",
"//third_party/jvm/javax/inject:javax_inject",
":dagger",
":dagger_producers"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
4 changes: 2 additions & 2 deletions third_party/jvm/com/google/errorprone/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_com/google/errorprone/error_prone_annotations"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand All @@ -17,7 +17,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_com/google/errorprone/javac_shaded"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
5 changes: 3 additions & 2 deletions third_party/jvm/com/google/googlejavaformat/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_com/google/googlejavaformat/google_java_format"
],
runtime_deps = [
"//third_party/jvm/com/google/errorprone:javac_shaded"
"//third_party/jvm/com/google/errorprone:javac_shaded",
"//third_party/jvm/com/google/guava:guava"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/com/google/j2objc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_com/google/j2objc/j2objc_annotations"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/com/googlecode/java_diff_utils/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_com/googlecode/java_diff_utils/diffutils"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/com/squareup/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_com/squareup/javapoet"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/javax/annotation/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_javax/annotation/jsr250_api"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/org/checkerframework/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_org/checkerframework/checker_compat_qual"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/org/codehaus/mojo/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_org/codehaus/mojo/animal_sniffer_annotations"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/jvm/org/hamcrest/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_org/hamcrest/hamcrest_core"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
12 changes: 12 additions & 0 deletions third_party/jvm/org/jetbrains/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
licenses(["notice"])
java_library(
name = "annotations",
exports = [
"//external:jar/io_bazel_rules_kotlin_org/jetbrains/annotations"
],
visibility = [
"//third_party/jvm:__subpackages__"
]
)


8 changes: 4 additions & 4 deletions third_party/jvm/org/jetbrains/kotlin/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ java_library(
"@com_github_jetbrains_kotlin//:kotlin-reflect"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand All @@ -17,7 +17,7 @@ java_library(
"@com_github_jetbrains_kotlin//:kotlin-script-runtime"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand All @@ -29,7 +29,7 @@ java_library(
"@com_github_jetbrains_kotlin//:kotlin-stdlib"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand All @@ -41,7 +41,7 @@ java_library(
"//external:jar/io_bazel_rules_kotlin_org/jetbrains/kotlin/kotlin_stdlib_common"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
7 changes: 5 additions & 2 deletions third_party/jvm/org/jetbrains/kotlinx/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ java_library(
exports = [
"//external:jar/io_bazel_rules_kotlin_org/jetbrains/kotlinx/atomicfu_common"
],
runtime_deps = [
"//third_party/jvm/org/jetbrains/kotlin:kotlin_stdlib_common"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down Expand Up @@ -37,7 +40,7 @@ java_library(
":atomicfu_common"
],
visibility = [
"//visibility:public"
"//third_party/jvm:__subpackages__"
]
)

Expand Down
Loading

0 comments on commit 4184f41

Please sign in to comment.