From d9567b3b999bbdf3e22280815d5ee0e3963357da Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Sun, 8 Oct 2023 12:28:06 +0000 Subject: [PATCH] java: use JDK 11 This is needed for newer versions of the gerrit owners plugin. We also need to add zlib to our shell, as binary builds of JDK11 used by Bazel require it. Change-Id: Idbbc5e0d88cac13daf2e5f201be6032412bf1a5d Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1641 Reviewed-by: implr --- .bazelrc | 1 + shell.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/.bazelrc b/.bazelrc index 9d3a556c..d56cdd17 100644 --- a/.bazelrc +++ b/.bazelrc @@ -8,3 +8,4 @@ test --build_tests_only test --test_output=errors build --cxxopt=-std=c++14 build --host_cxxopt=-std=c++14 +build --java_language_version=11 diff --git a/shell.nix b/shell.nix index 6be64bdf..10dd95c1 100644 --- a/shell.nix +++ b/shell.nix @@ -65,6 +65,7 @@ in (pkgs.buildFHSUserEnv { vim openssh libxcrypt + zlib ]; multiPkgs = pkgs: [ (pkgs.runCommand "protocols" {}