Skip to content

Commit

Permalink
coursier: don't pass -noverify for java 13+
Browse files Browse the repository at this point in the history
In Java 13 -noverify got marked as deprecated and may be dropped in the
future
  • Loading branch information
manuelnaranjo committed Mar 22, 2024
1 parent b29be75 commit 0e1329c
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion coursier.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,16 @@ def make_coursier_dep_tree(
"--" +
":".join([e["group"], e["artifact"]]))

# extract java_version
java_path = _java_path(repository_ctx)
java_version = 0
if java_path:
exec_result = _execute(repository_ctx, [java_path, "-version"])
if (exec_result.return_code != 0):
fail("Error while running java -version: " + exec_result.stderr)

java_version = parse_java_version(exec_result.stdout + exec_result.stderr)

cmd = _generate_java_jar_command(repository_ctx, repository_ctx.path("coursier"))
cmd.extend(["fetch"])

Expand Down Expand Up @@ -858,7 +868,13 @@ def make_coursier_dep_tree(
exec_result = _execute(repository_ctx, [java_path, "-version"])
if (exec_result.return_code != 0):
fail("Error while running java -version: " + exec_result.stderr)
if parse_java_version(exec_result.stdout + exec_result.stderr) > 8:

java_version = parse_java_version(exec_result.stdout + exec_result.stderr)
if java_version > 13:
if "-noverify" in cmd:
cmd.remove("-noverify")

if java_version > 8:
java_cmd = cmd[0]
java_args = cmd[1:]

Expand Down

0 comments on commit 0e1329c

Please sign in to comment.