Skip to content

Commit

Permalink
[Java] Upgrade to Gradle 8.12.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
vyazelenko committed Jan 30, 2025
1 parent cc078c4 commit b593142
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
15 changes: 7 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,6 @@ subprojects {
}

tasks.withType(JavaCompile).configureEach {
doFirst {
mkdir 'build/resources/main' // Avoid Javac warning about non-existing directory
}

options.compilerArgs.add('--release')
options.compilerArgs.add(java.sourceCompatibility.majorVersion)
options.compilerArgs.addAll(['-Xlint:all', '-Werror']) // Enable all warnings and treat them as errors
Expand Down Expand Up @@ -314,6 +310,9 @@ project(':agrona') {
from sourceSets.generated.output

bundle {
// workaround for https://github.com/bndtools/bnd/issues/6346
properties.put("project.group", provider({project.group}))
// workaround
bnd """
Automatic-Module-Name: org.agrona.core
Bundle-Name: org.agrona.core
Expand Down Expand Up @@ -359,7 +358,7 @@ project(':agrona') {
repositories {
maven {
name = 'MavenCentral'
url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl)
url = !isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -445,7 +444,7 @@ project(':agrona-agent') {
repositories {
maven {
name = 'MavenCentral'
url(!isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl)
url = !isReleaseVersion ? ossrhSnapshotsRepoUrl : ossrhReleasesRepoUrl
credentials {
username = ossrhUsername
password = ossrhPassword
Expand Down Expand Up @@ -517,7 +516,7 @@ project(':agrona-concurrency-tests') {

tasks.register('parseResultsFile', JavaExec) {
dependsOn shadowJar
group 'verification'
group = 'verification'
classpath = files(tasks.shadowJar)
workingDir = layout.buildDirectory.get()
args = ['-p', jcstressResults, '-r', 'reports/jcstress']
Expand Down Expand Up @@ -561,7 +560,7 @@ tasks.register('tarTestLogs', Tar) {
dependsOn tasks.named('copyTestLogs')
archiveBaseName.set('test_logs')
from 'build/test_logs'
compression Compression.BZIP2
compression = Compression.BZIP2
}

wrapper {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ commons-codec = "1.15"
commons-lang3 = "3.8.1"
findbugs = "3.0.1"
guava = "33.4.0-jre"
gradle = "8.11.1"
gradle = "8.12.1"
hamcrest = "3.0"
httpcore = "4.4.14"
jcstress = "0.16"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# 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
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down

0 comments on commit b593142

Please sign in to comment.