Skip to content

Commit

Permalink
[Java] Upgrade to Gradle 8.10.
Browse files Browse the repository at this point in the history
  • Loading branch information
vyazelenko committed Aug 23, 2024
1 parent d910c1f commit ea44766
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 34 deletions.
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ buildscript {
}

plugins {
id 'application'
id 'base'
id 'java-library'
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
id 'biz.aQute.bnd.builder' version '6.4.0' apply false
Expand Down Expand Up @@ -172,6 +174,7 @@ allprojects {
}

subprojects {
apply plugin: 'base'
apply plugin: 'java-library'
apply plugin: 'checkstyle'

Expand Down Expand Up @@ -332,24 +335,19 @@ subprojects {
options.charSet = 'UTF-8'
options.links("https://www.javadoc.io/doc/org.agrona/agrona/${agronaVersion}/")

if (buildJavaVersion > 21) { // early access JavaDoc location is different
if (buildJavaVersion >= 23) { // early access JavaDoc location is different
options.links("https://download.java.net/java/early_access/jdk${buildJavaVersion}/docs/api/")
}
else if (buildJavaVersion >= 11) {
options.links("https://docs.oracle.com/en/java/javase/${buildJavaVersion}/docs/api/")
}
else {
options.links("https://docs.oracle.com/javase/${buildJavaVersion}/docs/api/")
options.links("https://docs.oracle.com/en/java/javase/${buildJavaVersion}/docs/api/")
}

if (buildJavaVersion >= 10) {
options.addBooleanOption 'html5', true
}
options.addBooleanOption('html5', true)
}

tasks.register('testJar', Jar) {
dependsOn 'testClasses'
archiveClassifier.set("test-${project.archivesBaseName}")
archiveClassifier.set("test-${base.archivesName}")
from sourceSets.test.output
}

Expand Down Expand Up @@ -531,7 +529,9 @@ project(':aeron-driver') {
apply plugin: 'application'
apply plugin: 'biz.aQute.bnd.builder'

mainClassName = 'io.aeron.driver.MediaDriver'
application {
mainClass.set('io.aeron.driver.MediaDriver')
}

dependencies {
api project(':aeron-client')
Expand Down Expand Up @@ -1340,6 +1340,6 @@ tasks.named('dependencyUpdates').configure {
}

wrapper {
gradleVersion = '8.1.1'
gradleVersion = '8.10'
distributionType = 'ALL'
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class AsciidoctorPreprocessTask extends DefaultTask

private final File source = new File(sampleBaseDir, "/src/docs/asciidoc");

private final File target = new File(getProject().getBuildDir(), "/asciidoc/asciidoc");
private final File target = new File(getProject().getLayout().getBuildDirectory().getAsFile().get(), "/asciidoc/asciidoc");

// Has a slightly silly name to avoid name clashes in the build script.
private String versionText;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ public void setRemoteName(final String remoteName)
public void publish() throws Exception
{
final String wikiUri = getWikiUri();
final File directory = new File(getProject().getBuildDir(), "tmp/tutorialPublish");
final File directory =
new File(getProject().getLayout().getBuildDirectory().getAsFile().get(), "tmp/tutorialPublish");
// Use Personal Access Token or GITHUB_TOKEN for workflows
final CredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(apiKey, "");

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
27 changes: 17 additions & 10 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -83,7 +85,9 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,26 +134,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -198,11 +205,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down Expand Up @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit ea44766

Please sign in to comment.