Skip to content

Commit

Permalink
Regenerate Project (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
pjreiniger authored Jun 22, 2024
1 parent 97578e1 commit 95e7a44
Show file tree
Hide file tree
Showing 10 changed files with 4,841 additions and 5,128 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.1
7.2.0
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

# Generated files
MODULE.bazel.lock linguist-generated
maven_cpp_deps.bzl linguist-generated
maven_java_deps.bzl linguist-generated
4 changes: 2 additions & 2 deletions .github/workflows/auto_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ jobs:
bazel run //:generate
buildifier -warnings all --lint=fix -r ..
cd ..
bazel build //... --nobuild --enable_bzlmod --lockfile_mode=update
bazel build //... --nobuild --enable_bzlmod --lockfile_mode=update -k || true
cd tests
bazel build //... --nobuild --enable_bzlmod --lockfile_mode=update
bazel build //... --nobuild --enable_bzlmod --lockfile_mode=update -k || true
# Pull requests won't be created if the github actions change. Since for this
# We mostly care about the actual code changes, we will just revert those files
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module(

bazel_dep(name = "platforms", version = "0.0.9")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_java", version = "7.5.0")
bazel_dep(name = "rules_java", version = "7.6.1")
bazel_dep(name = "rules_bazelrio", version = "0.0.14")
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")

Expand Down
1,762 changes: 174 additions & 1,588 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions private/non_bzlmod_dependencies/download_dependencies.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ def download_dependencies():
# Rules Java
http_archive(
name = "rules_java",
sha256 = "4da3761f6855ad916568e2bfe86213ba6d2637f56b8360538a7fb6125abf6518",
url = "https://github.com/bazelbuild/rules_java/releases/download/7.5.0/rules_java-7.5.0.tar.gz",
sha256 = "f8ae9ed3887df02f40de9f4f7ac3873e6dd7a471f9cddf63952538b94b59aeb3",
url = "https://github.com/bazelbuild/rules_java/releases/download/7.6.1/rules_java-7.6.1.tar.gz",
)

# JVM External
Expand Down
2 changes: 1 addition & 1 deletion tests/.bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.1
7.2.0
2 changes: 1 addition & 1 deletion tests/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local_path_override(

bazel_dep(name = "googletest", version = "1.14.0")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "rules_java", version = "7.5.0")
bazel_dep(name = "rules_java", version = "7.6.1")
bazel_dep(name = "rules_jvm_external", version = "6.1")
bazel_dep(name = "rules_bazelrio", version = "0.0.14")
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
Expand Down
8,182 changes: 4,654 additions & 3,528 deletions tests/MODULE.bazel.lock

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions tests/java/opencv/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ bazelrio_java_test(
"--select-package",
"opencv",
],
env = {
"LD_LIBRARY_PATH": ".",
"PATH": ".",
}, # TODO fishy
javacopts = ["-Werror"],
jvm_flags = [
"-Djava.library.path=.",
Expand Down

0 comments on commit 95e7a44

Please sign in to comment.