update skydoc stack and get doc gen working again (somewhat)
diff --git a/.bazelrc b/.bazelrc
index c610825..ec72b2f 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,3 +1,6 @@
build --strategy=KotlinCompile=worker
build --test_output=errors
-build --verbose_failures
\ No newline at end of file
+build --verbose_failures
+
+# Cannot use this until skydoc removes filetypes as well.
+# build --incompatible_disallow_filetype
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 438e0b0..f79584b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,4 +17,4 @@
docs.preview_local:
bazel build //docs --define local=1
unzip -o bazel-bin/docs/docs-skydoc.zip -d /tmp/rules_kotlin
- open /tmp/rules_kotlin/kotlin/kotlin.html
+ open /tmp/rules_kotlin/index.html
diff --git a/WORKSPACE b/WORKSPACE
index 78c3887..f7146f8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,18 +20,32 @@
commit = "106ffc04be1abf3ff3399f54ccf149815b287dd9",
)
-git_repository(
- name = "io_bazel_rules_sass",
- remote = "https://github.com/bazelbuild/rules_sass.git",
- tag = "0.0.3",
+github_archive(
+ name = "build_bazel_rules_nodejs",
+ repo = "bazelbuild/rules_nodejs",
+ commit = "df3d2f577ec57ef5a622c809288a29545470c15d",
)
-load("@io_bazel_rules_sass//sass:sass.bzl", "sass_repositories")
+load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
+node_repositories(package_json = [])
+
+github_archive(
+ name = "io_bazel_rules_sass",
+ repo = "bazelbuild/rules_sass",
+ commit = "38989d69ef3ba5847640f007fee5cc489be6ede9"
+)
+load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
sass_repositories()
-git_repository(
+github_archive(
+ name = "bazel_skylib",
+ repo = "bazelbuild/bazel-skylib",
+ commit = "6301f974f02350fe973d8631cf1bb87ab8d2a2bd"
+)
+
+github_archive(
name = "io_bazel_skydoc",
- remote = "https://github.com/bazelbuild/skydoc.git",
- tag = "0.1.4"
+ repo = "bazelbuild/skydoc",
+ commit="f531844d137c7accc44d841c08a2a2a366688571"
)
load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")
skydoc_repositories()
diff --git a/docs/BUILD b/docs/BUILD
index 0ce6af1..dda09b8 100644
--- a/docs/BUILD
+++ b/docs/BUILD
@@ -1,4 +1,5 @@
-load("@io_bazel_skydoc//skylark:skylark.bzl", "skylark_doc", "skylark_library" )
+load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
+load("@io_bazel_skydoc//skylark:skylark.bzl", "skylark_doc" )
skylark_library(
name = "doc_public",
@@ -14,7 +15,7 @@
skylark_doc(
name = "docs",
- deps = [
+ srcs = [
":doc_public",
":doc_toolchains"
],
