Skip to content

Update to Gradle 9.0 #4657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,5 +109,5 @@ kotlin = { id = "org.jetbrains.kotlin.jvm", version = "2.2.0-RC3" }
nullaway = { id = "net.ltgt.nullaway", version = "2.2.0" }
openrewrite = { id = "org.openrewrite.rewrite", version = "7.8.0" }
plantuml = { id = "io.freefair.plantuml", version = "8.13.1" }
shadow = { id = "com.gradleup.shadow", version = "8.3.6" }
shadow = { id = "com.gradleup.shadow", version = "9.0.0-beta17" }
spotless = { id = "com.diffplug.spotless", version = "7.0.4" }
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ tasks {
exclude("META-INF/maven/**")
excludes.remove("module-info.class")
archiveClassifier = ""
from(sourceSets.main.get().output.classesDirs) {
include("module-info.class")
}
}
jar {
dependsOn(shadowJar)
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
distributionSha256Sum=5086034b0656a79fee07a04cfadc103984b075ac85d3a20748649671283be1bb
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.junit.platform.reporting.testutil.FileUtils;
import org.junit.platform.tests.process.OutputFiles;
import org.opentest4j.TestAbortedException;

Expand All @@ -41,11 +40,8 @@ void gradle_wrapper(@TempDir Path workspace, @FilePrefix("gradle") OutputFiles o
.redirectOutput(outputFiles).startAndWait();

assertEquals(1, result.exitCode());
assertThat(result.stdErrLines()) //
.contains("FAILURE: Build failed with an exception.");

var htmlFile = FileUtils.findPath(workspace, "glob:**/build/reports/tests/test/classes/*.html");
assertThat(htmlFile).content() //
assertThat(result.stdErr()) //
.contains("FAILURE: Build failed with an exception.") //
.contains("Cannot create Launcher without at least one TestEngine");
}
}
Loading