Skip to content

Commit 1bb1560

Browse files
authored
Merge branch 'master' into SnapshotLink
2 parents 619ed69 + 6db37a3 commit 1bb1560

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

allVariants

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
2-
for var in 2.5 3.0 4.0; do
2+
for var in 2.5 3.0 4.0 5.0; do
33
./gradlew -Dvariant="$var" "$@"
44
done

allVariants.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@echo off
2-
for %%v in (2.5 3.0 4.0) do (
2+
for %%v in (2.5 3.0 4.0 5.0) do (
33
gradlew.bat -Dvariant=%%v %*
44
)

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ if (gradle.startParameter.taskNames == ["ghActionsPublish"] || gradle.startParam
237237
}
238238

239239
if (originalStartParameterTaskNames == ["ghActionsPublish"]) {
240-
if (javaVersion != javaVersions.min()) {
241-
throw new IllegalArgumentException("ghActionsPublish can only be run on Java ${javaVersions.min()} but was run on $javaVersion")
240+
if ((javaVersion != javaVersions.min()) && ((variant != 5.0) || (javaVersion != 11))) {
241+
throw new IllegalArgumentException("ghActionsPublish can only be run on Java ${javaVersions.min()} (or 11 for variant 5.0) but was run on $javaVersion")
242242
}
243243
/*
244244
We want to release only snapshots directly from master, final releases will be tagged and then published from that tag.

0 commit comments

Comments
 (0)