Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Upgrade Gradle 8.4 to 8.5 and upgrade related Gradle Plugins #805

Merged
merged 11 commits into from
Feb 7, 2024
Merged

Upgrade Gradle 8.4 to 8.5 and upgrade related Gradle Plugins #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
beac88b
Upgrade Gradle wrapper to 8.5
TWiStErRob Jan 28, 2024
299c95e
Remove unused :demo project
TWiStErRob Jan 28, 2024
17af7fd
Bump all Gradle plugins to latest
TWiStErRob Jan 28, 2024
35b7487
Hide warning:
TWiStErRob Jan 28, 2024
784c093
Remove unnecessary JMS override:
TWiStErRob Jan 28, 2024
8d52776
Remove link
TWiStErRob Feb 2, 2024
c717690
Merge remote-tracking branch 'origin/main' into gradle85
TWiStErRob Feb 7, 2024
b4d43d4
Bump nexus to RC2
TWiStErRob Feb 7, 2024
5e4a924
See https://github.com/gradle-nexus/publish-plugin/issues/220#issueco…
TWiStErRob Feb 7, 2024
78de1e8
Fix Deprecation
TWiStErRob Feb 7, 2024
6ae5fff
Add contributor
TWiStErRob Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
# force all text files on the working dir to have LF line endings
# https://git-scm.com/docs/gitattributes#_eol
* text eol=lf

*.bat text eol=crlf
*.jar binary
Michael1993 marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,12 @@ Thank you for your efforts! ?

The least we can do is to thank them and list some of their accomplishments here (in lexicographic order).

==== 2024

* https://github.com/TWiStErRob[Papp Róbert (TWiStErRob)] updated Gradle and GitHub Actions tooling to latest. (#803 / #804 / #805)

==== 2023

* https://github.com/eeverman[Eric Everman] added `@RestoreSystemProperties` and `@RestoreEnvironmentVariables` annotations to the https://junit-pioneer.org/docs/system-properties/[System Properties] and https://junit-pioneer.org/docs/environment-variables/[Environment Variables] extensions (#574 / #700)
* https://github.com/meredrica[Florian Westreicher] contributed to the JSON argument source extension (#704 / #724)
* https://github.com/IlyasYOY[Ilya Ilyinykh] found unused demo tests (#791)
Expand Down
22 changes: 8 additions & 14 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ plugins {
checkstyle
`maven-publish`
signing
id("com.diffplug.spotless") version "6.21.0"
id("com.diffplug.spotless") version "6.25.0"
id("at.zierler.yamlvalidator") version "1.5.0"
id("org.sonarqube") version "4.3.1.3277"
id("org.shipkit.shipkit-changelog") version "1.2.0"
id("org.shipkit.shipkit-github-release") version "1.2.0"
id("com.github.ben-manes.versions") version "0.48.0"
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("org.gradlex.extra-java-module-info") version "1.4.2"
id("org.sonarqube") version "4.4.1.3373"
id("org.shipkit.shipkit-changelog") version "2.0.1"
TWiStErRob marked this conversation as resolved.
Show resolved Hide resolved
id("org.shipkit.shipkit-github-release") version "2.0.1"
id("com.github.ben-manes.versions") version "0.51.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0-rc-2"
id("org.gradlex.extra-java-module-info") version "1.7"
}

plugins.withType<JavaPlugin>().configureEach {
Expand Down Expand Up @@ -173,7 +173,7 @@ signing {
}

nexusPublishing {
this.repositories {
repositories {
sonatype()
}
}
Expand All @@ -184,7 +184,6 @@ extraJavaModuleInfo {
automaticModule("com.google.guava:listenablefuture", "com.google.guava.listenablefuture")
automaticModule("com.google.code.findbugs:jsr305", "com.google.code.findbugs.jsr305")
automaticModule("com.google.j2objc:j2objc-annotations", "com.google.j2objc.annotations")
automaticModule("com.google.jimfs:jimfs", "com.google.jimfs")
}

tasks {
Expand All @@ -198,11 +197,6 @@ tasks {
runtimeClasspath += sourceSets.main.get().output
}
}
project(":demo") {
this.sonar {
isSkipProject = true
}
}
Comment on lines -201 to -205
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you delete this part?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See 299c95e

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the :demo project used in any way? I couldn't find any scripts or references to it in the repo other than definition and exclusion from sonar.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Bukama please answer #805 (comment), and/or resolve this. From the code alone I don't see :demo usages.

// Adds all dependencies of main to demo sourceSet
configurations["demoImplementation"].extendsFrom(configurations.testImplementation.get())
// Ensures JUnit 5 engine is available to demo at runtime
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
12 changes: 9 additions & 3 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
rootProject.name = "junit-pioneer"
include("demo")

plugins {
id("com.gradle.enterprise") version "3.14.1"
id("com.gradle.enterprise") version "3.16.2"
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}

gradleEnterprise {
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
}
}
}

// TODO move this to a better place once https://sonarsource.atlassian.net/browse/SONARGRADL-134 is resolved.
// > The 'sonar' / 'sonarqube' task depends on compile tasks.
// > This behavior is now deprecated and will be removed in version 5.x.
// > To avoid implicit compilation, set property 'sonar.gradle.skipCompile' to 'true' and make sure your project is compiled, before analysis has started.
System.setProperty("sonar.gradle.skipCompile", "true")
2 changes: 1 addition & 1 deletion src/test/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
requires org.mockito;
requires org.assertj.core;
requires nl.jqno.equalsverifier;
requires com.google.jimfs;
requires com.google.common.jimfs;

// via org.assertj.core
requires java.instrument;
Expand Down