Refactor dev (#1)

pjreiniger · web-flow · commit 4cd34b0fd950 · 2023-05-10T03:05:33.000-04:00
* Raspbian

* Update bazel version

* Gen stuff

* More dep updates

* Another update
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.0.0
+6.2.0
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -75,5 +75,5 @@ jobs:
         base: bzlmodrio
         token: ${{ secrets.AUTO_UPDATE_KEY }}
         reviewers: pjreiniger
-        branch: autoupdate/rules_wpi_styleguid_update
+        branch: autoupdate/bzlmodrio-opencv_update
         title: "Auto-update latest bzlmodrio-opencv module release"
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -5,7 +5,7 @@ module(
 )
 
 bazel_dep(name = "platforms", version = "0.0.6")
-bazel_dep(name = "rules_java", version = "5.4.0")
+bazel_dep(name = "rules_java", version = "5.5.0")
 bazel_dep(name = "rules_bazelrio", version = "0.0.10")
 bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")
 
diff --git a/generate/WORKSPACE b/generate/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "bzlmodrio_ni_gentool")
+workspace(name = "bzlmodrio_opencv_gentool")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
diff --git a/libraries/cpp/opencv/BUILD.bazel b/libraries/cpp/opencv/BUILD.bazel
@@ -7,6 +7,10 @@ alias(
 cc_library(
     name = "shared",
     linkstatic = 1,
+    target_compatible_with = select({
+        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
     visibility = ["//visibility:public"],
     deps = [
     ] + [
@@ -17,6 +21,10 @@ cc_library(
 cc_library(
     name = "static",
     linkstatic = 1,
+    target_compatible_with = select({
+        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
     visibility = ["//visibility:public"],
     deps = [
     ] + [
diff --git a/private/cpp/opencv/BUILD.bazel b/private/cpp/opencv/BUILD.bazel
@@ -1,6 +1,10 @@
 cc_library(
     name = "shared",
     linkstatic = 1,
+    target_compatible_with = select({
+        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
     visibility = ["@bzlmodrio-opencv//:__subpackages__"],
     deps = ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:headers"] + select({
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathena//:shared_libs"],
@@ -21,6 +25,10 @@ cc_library(
 cc_library(
     name = "static",
     linkstatic = 1,
+    target_compatible_with = select({
+        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
     visibility = ["@bzlmodrio-opencv//:__subpackages__"],
     deps = ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:headers"] + select({
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastatic//:static_libs"],
@@ -41,6 +49,10 @@ cc_library(
 cc_library(
     name = "jni",
     linkstatic = 1,
+    target_compatible_with = select({
+        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
     visibility = ["@bzlmodrio-opencv//:__subpackages__"],
     deps = ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:headers"] + select({
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathena//:shared_jni_libs"],
diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl
@@ -2,13 +2,11 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 def download_dependencies():
     # JVM External
-    RULES_JVM_EXTERNAL_COMMITISH = "4.5"
-    RULES_JVM_EXTERNAL_SHA = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6"
     http_archive(
         name = "rules_jvm_external",
-        sha256 = RULES_JVM_EXTERNAL_SHA,
-        strip_prefix = "rules_jvm_external-{}".format(RULES_JVM_EXTERNAL_COMMITISH),
-        url = "https://github.com/bazelbuild/rules_jvm_external/archive/{}.zip".format(RULES_JVM_EXTERNAL_COMMITISH),
+        sha256 = "f86fd42a809e1871ca0aabe89db0d440451219c3ce46c58da240c7dcdc00125f",
+        strip_prefix = "rules_jvm_external-5.2",
+        url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/5.2/rules_jvm_external-5.2.tar.gz",
     )
 
     # Bazelrio Rules
@@ -22,7 +20,7 @@ def download_dependencies():
     http_archive(
         name = "rules_bzlmodrio_toolchains",
         sha256 = "1c566358f97b093916e150de10b65d6527ad268e5bd8bc0a0a8bfd04b390751a",
-        url = "https://github.com/bzlmodRio/rules_bzlmodrio_toolchains/releases/download/2023-7/rules_bzlmodrio_toolchains-2023-7.tar.gz",
+        url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2023-7/rules_bzlmodRio_toolchains-2023-7.tar.gz",
     )
 
     ########################
diff --git a/tests/.bazelversion b/tests/.bazelversion
@@ -1 +1 @@
-6.0.0
+6.2.0
diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel
@@ -5,8 +5,8 @@ local_path_override(
 )
 
 bazel_dep(name = "googletest", version = "1.12.1")
-bazel_dep(name = "rules_cc", version = "0.0.4")
-bazel_dep(name = "rules_jvm_external", version = "4.5")
+bazel_dep(name = "rules_cc", version = "0.0.6")
+bazel_dep(name = "rules_jvm_external", version = "5.2")
 bazel_dep(name = "rules_bazelrio", version = "0.0.10")
 bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")
 bazel_dep(name = "rules_pmd", version = "6.43.0")
diff --git a/tests/WORKSPACE b/tests/WORKSPACE
@@ -54,7 +54,7 @@ maven_install(
 
 http_archive(
     name = "rules_wpi_styleguide",
-    sha256 = "d0f717a73d18b40f5e7f921e434692cffa1dea5b3138c2cc64c5355530f4eb47",
+    sha256 = "c5c032e8e8b04cdd74d2a637c39e787156cd289d128cd9747b5c8c6d87d4f252",
     url = "https://github.com/bzlmodRio/rules_wpi_styleguide/releases/download/1.0.0/rules_wpi_styleguide-1.0.0.tar.gz",
 )
 
@@ -66,6 +66,10 @@ load("@rules_wpi_styleguide//dependencies:load_dependencies.bzl", "load_stylegui
 
 load_styleguide_dependencies()
 
+load("@rules_wpi_styleguide//dependencies:load_transitive_dependencies.bzl", "load_styleguide_transitive_dependencies")
+
+load_styleguide_transitive_dependencies()
+
 load("@rules_wpi_styleguide//dependencies:setup_styleguide.bzl", "setup_styleguide")
 
 setup_styleguide()

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ module(`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`bazel_dep(name = "platforms", version = "0.0.6")`
`8`		`-bazel_dep(name = "rules_java", version = "5.4.0")`
	`8`	`+bazel_dep(name = "rules_java", version = "5.5.0")`
`9`	`9`	`bazel_dep(name = "rules_bazelrio", version = "0.0.10")`
`10`	`10`	`bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-workspace(name = "bzlmodrio_ni_gentool")`
	`1`	`+workspace(name = "bzlmodrio_opencv_gentool")`
`2`	`2`
`3`	`3`	`load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")`
`4`	`4`