Merge pull request #66 from confluentinc/vinnybod/upstream-merge-6.9

Merge upstream changes up to 6.9

Author: vinnybod

.bazelci/examples.yml

@@ -5,31 +5,31 @@ tasks:
     platform: ubuntu1804
     working_directory: examples/android_kotlin_app
     build_targets:
-    - "//:app"
+      - "//:app"
   android-kotlin-macos:
     name: "Android Kotlin example"
     platform: macos
     working_directory: examples/android_kotlin_app
     build_targets:
-    - "//:app"
+      - "//:app"
   android-kotlin-windows:
     name: "Android Kotlin example"
     platform: windows
     working_directory: examples/android_kotlin_app
     build_targets:
-    - "//:app"
+      - "//:app"
   android-local-test-linux:
     name: "Android Robolectric test example"
     platform: ubuntu1804
     working_directory: examples/android_local_test
     test_targets:
       - "//..."
-#  android-local-test-macos:
-#    name: "Android Robolectric test example"
-#    platform: macos
-#    working_directory: examples/android_local_test
-#    test_targets:
-#      - "//..."
+  android-local-test-macos:
+    name: "Android Robolectric test example"
+    platform: macos
+    working_directory: examples/android_local_test
+    test_targets:
+      - "//..."
   android-local-test-windows:
     name: "Android Robolectric test example"
     platform: windows
@@ -78,12 +78,12 @@ tasks:
     working_directory: examples/kt_android_local_test
     test_targets:
       - "//..."
-#  kotlin-android-local-test-macos:
-#    name: "Kotlin Android Robolectric test example"
-#    platform: macos
-#    working_directory: examples/kt_android_local_test
-#    test_targets:
-#      - "//..."
+  #  kotlin-android-local-test-macos:
+  #    name: "Kotlin Android Robolectric test example"
+  #    platform: macos
+  #    working_directory: examples/kt_android_local_test
+  #    test_targets:
+  #      - "//..."
   kotlin-android-local-test-windows:
     name: "Kotlin Android Robolectric test example"
     platform: windows
@@ -102,14 +102,14 @@ tasks:
     working_directory: examples/kt_jvm_export
     build_targets:
       - "//..."
-# Ignored because none of the rje team have access to a Windows
-# machine to properly investigate the issue
-#  kotlin-jvm-export-windows:
-#    name: "kt_jvm_export example"
-#    platform: windows
-#    working_directory: examples/kt_jvm_export
-#    build_targets:
-#      - "//..."
+  # Ignored because none of the rje team have access to a Windows
+  # machine to properly investigate the issue
+  #  kotlin-jvm-export-windows:
+  #    name: "kt_jvm_export example"
+  #    platform: windows
+  #    working_directory: examples/kt_jvm_export
+  #    build_targets:
+  #      - "//..."
   pom-file-generation-linux:
     name: "POM file generation example"
     platform: ubuntu1804
@@ -142,7 +142,7 @@ tasks:
       - "//..."
   protobuf-java-windows:
     name: "Protobuf Java example"
-    platform: windows 
+    platform: windows
     working_directory: examples/protobuf-java
     # //src/test:diff_json_test / diff_test does not ignore line endings
     # correctly on Windows.
@@ -153,39 +153,39 @@ tasks:
     platform: ubuntu1804
     working_directory: examples/scala_akka
     build_targets:
-    - "//..."
+      - "//..."
     test_targets:
-    - "//..."
+      - "//..."
   scala-akka-macos:
     name: "Scala example"
     platform: macos
     working_directory: examples/scala_akka
     build_targets:
-    - "//..."
+      - "//..."
     test_targets:
-    - "//..."
+      - "//..."
   scala-akka-windows:
     name: "Scala example"
     platform: windows
     working_directory: examples/scala_akka
     build_targets:
-    - "//..."
+      - "//..."
     # test_targets:
     # https://github.com/bazelbuild/rules_jvm_external/issues/103
     # - "//..."
   simple-linux:
     name: "Simple example"
     platform: ubuntu1804
     working_directory: examples/simple
-    shell_command: 
+    shell_command:
       - "bazel run @maven//:pin"
     build_targets:
       - "//..."
   simple-macos:
     name: "Simple example"
     platform: macos
     working_directory: examples/simple
-    shell_command: 
+    shell_command:
       - "bazel run @maven//:pin"
     build_targets:
       - "//..."
@@ -200,22 +200,22 @@ tasks:
     platform: ubuntu1804
     working_directory: examples/spring_boot
     build_targets:
-    - "//..."
+      - "//..."
     test_targets:
-    - "//..."
+      - "//..."
   spring-boot-macos:
     name: "Spring boot example"
     platform: macos
     working_directory: examples/spring_boot
     build_targets:
-    - "//..."
+      - "//..."
     test_targets:
-    - "//..."
+      - "//..."
   spring-boot-windows:
     name: "Spring boot example"
     platform: windows
     working_directory: examples/spring_boot
     build_targets:
-    - "//..."
+      - "//..."
     test_targets:
-    - "//..."
+      - "//..."

MODULE.bazel

@@ -1,57 +1,21 @@
 module(
     name = "rules_jvm_external",
-    version = "6.8",
+    version = "6.9",
     bazel_compatibility = [">=7.0.0"],
 )
 
-bazel_dep(
-    name = "rules_android",
-    version = "0.1.1",
-)
-bazel_dep(
-    name = "bazel_features",
-    version = "1.19.0",
-)
-bazel_dep(
-    name = "bazel_skylib",
-    version = "1.7.1",
-)
-bazel_dep(
-    name = "package_metadata",
-    version = "0.0.3",
-)
-bazel_dep(
-    name = "platforms",
-    version = "0.0.10",
-)
-bazel_dep(
-    name = "rules_license",
-    version = "1.0.0",
-)
-bazel_dep(
-    name = "rules_java",
-    version = "7.12.2",
-)
-bazel_dep(
-    name = "rules_kotlin",
-    version = "1.9.6",
-)
-bazel_dep(
-    name = "rules_shell",
-    version = "0.3.0",
-)
+bazel_dep(name = "rules_android", version = "0.1.1")
+bazel_dep(name = "bazel_features", version = "1.19.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "package_metadata", version = "0.0.3")
+bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "rules_license", version = "1.0.0")
+bazel_dep(name = "rules_java", version = "7.12.2")
+bazel_dep(name = "rules_kotlin", version = "1.9.6")
+bazel_dep(name = "rules_shell", version = "0.3.0")
 
-bazel_dep(
-    name = "aspect_bazel_lib",
-    version = "2.20.0",
-    dev_dependency = True,
-)
-bazel_dep(
-    name = "stardoc",
-    version = "0.7.0",
-    dev_dependency = True,
-    repo_name = "io_bazel_stardoc",
-)
+bazel_dep(name = "aspect_bazel_lib", version = "2.20.0", dev_dependency = True)
+bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True, repo_name = "io_bazel_stardoc")
 
 # Remove this once rules_android has rolled out official Bzlmod support
 remote_android_extensions = use_extension("@bazel_tools//tools/android:android_extensions.bzl", "remote_android_tools_extensions")
@@ -100,14 +64,12 @@ maven.install(
         "org.slf4j:jul-to-slf4j:2.0.12",
         "org.slf4j:log4j-over-slf4j:2.0.12",
         "org.slf4j:slf4j-simple:2.0.12",
-        "org.slf4j:slf4j-api:2.0.12",
         "software.amazon.awssdk:s3:2.26.12",
         "software.amazon.awssdk:sdk-core:2.26.12",
         "org.bouncycastle:bcprov-jdk15on:1.68",
         "org.bouncycastle:bcpg-jdk15on:1.68",
         "org.gradle:gradle-tooling-api:%s" % _GRADLE_VERSION,
         "com.github.jknack:handlebars:4.3.1",
-        "com.google.http-client:google-http-client:1.45.0",
     ],
     fetch_sources = True,
     lock_file = "//:rules_jvm_external_deps_install.json",
@@ -668,6 +630,8 @@ dev_maven.install(
         "com.github.spotbugs:spotbugs:4.7.0",
         # https://github.com/bazelbuild/rules_jvm_external/issues/1267
         "org.mockito:mockito-core:3.3.3@pom",
+        # https://github.com/bazel-contrib/rules_jvm_external/issues/1461
+        "com.almworks.sqlite4java:libsqlite4java-linux-i386:1.0.392",
     ],
     generate_compat_repositories = True,
     lock_file = "//tests/custom_maven_install:regression_testing_coursier_install.json",
@@ -737,6 +701,8 @@ dev_maven.install(
         "io.opentelemetry:opentelemetry-sdk",
         # https://github.com/bazel-contrib/rules_jvm_external/issues/132
         "com.amazonaws:DynamoDBLocal:1.25.0",
+        # https://github.com/bazel-contrib/rules_jvm_external/issues/1461
+        "com.almworks.sqlite4java:libsqlite4java-linux-i386:1.0.392",
     ],
     boms = [
         "io.opentelemetry:opentelemetry-bom:1.31.0",
@@ -767,6 +733,10 @@ dev_maven.install(
         "androidx.annotation:annotation:1.6.0",
         # https://github.com/bazel-contrib/rules_jvm_external/issues/1409
         "com.squareup.okhttp3:okhttp:4.12.0",
+        # https://github.com/bazel-contrib/rules_jvm_external/issues/1461
+        "com.almworks.sqlite4java:libsqlite4java-linux-i386:1.0.392",
+        # https://github.com/bazel-contrib/rules_jvm_external/issues/1471
+        "androidx.fragment:fragment-ktx:1.6.1",
     ],
     generate_compat_repositories = True,
     lock_file = "//tests/custom_maven_install:regression_testing_gradle_install.json",

WORKSPACE

@@ -388,6 +388,8 @@ maven_install(
         "androidx.annotation:annotation:1.6.0",
         # https://github.com/bazel-contrib/rules_jvm_external/issues/1409
         "com.squareup.okhttp3:okhttp:4.12.0",
+        # https://github.com/bazel-contrib/rules_jvm_external/issues/1471
+        "androidx.fragment:fragment-ktx:1.6.1",
     ],
     generate_compat_repositories = True,
     maven_install_json = "//tests/custom_maven_install:regression_testing_gradle_install.json",

defs.bzl

@@ -15,6 +15,7 @@
 load("//private:constants.bzl", _DEFAULT_REPOSITORY_NAME = "DEFAULT_REPOSITORY_NAME")
 load("//private/rules:artifact.bzl", _artifact = "artifact", _java_plugin_artifact = "java_plugin_artifact", _maven_artifact = "maven_artifact")
 load("//private/rules:has_maven_deps.bzl", _read_coordinates = "read_coordinates")
+load("//private/rules:jar.bzl", _create_jar = "create_jar")
 load("//private/rules:java_export.bzl", _java_export = "java_export", _maven_export = "maven_export")
 load("//private/rules:javadoc.bzl", _javadoc = "javadoc")
 load("//private/rules:maven_bom.bzl", _maven_bom = "maven_bom")
@@ -33,5 +34,6 @@ maven_artifact = _maven_artifact
 maven_bom = _maven_bom
 maven_install = _maven_install
 pom_file = _pom_file
+create_jar = _create_jar
 read_coordinates = _read_coordinates
 MavenPublishInfo = _MavenPublishInfo

docs/BUILD

@@ -22,6 +22,7 @@ stardoc(
     deps = [
         "//:implementation",
         "@bazel_skylib//lib:structs",
+        "@bazel_skylib//rules:run_binary",
     ],
 )
 

examples/android_local_test/WORKSPACE

@@ -7,9 +7,9 @@ android_sdk_repository(
 
 http_archive(
     name = "robolectric",
-    sha256 = "b2d2164bae80fcfbdd078eb2f0935ba06557402b8c814928d9e3bec7358e2b7b",
-    strip_prefix = "robolectric-bazel-4.14.1.2",
-    urls = ["https://github.com/robolectric/robolectric-bazel/releases/download/4.14.1.2/robolectric-bazel-4.14.1.2.tar.gz"],
+    sha256 = "cf04b4206b9d21b385e8dbee478fac619fc1344e8e46935dcec2d64939dd0525",
+    strip_prefix = "robolectric-bazel-4.16",
+    urls = ["https://github.com/robolectric/robolectric-bazel/releases/download/4.16/robolectric-bazel-4.16.tar.gz"],
 )
 
 load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
@@ -34,8 +34,9 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
 maven_install(
     artifacts = [
         "androidx.appcompat:appcompat:1.0.2",
-        "androidx.test.ext:junit:1.1.0",
-        "org.robolectric:robolectric:4.14.1",
+        "androidx.test.ext:junit:1.3.0",
+        "junit:junit:4.13.2",
+        "org.robolectric:robolectric:4.16",
         "org.assertj:assertj-core:3.12.1",
     ],
     maven_install_json = "//:maven_install.json",