diff --git a/.gitattributes b/.gitattributes
index 443d3cc55..9ec8dc229 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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
diff --git a/README.adoc b/README.adoc
index aa5bc00ea..e0e209b3e 100644
--- a/README.adoc
+++ b/README.adoc
@@ -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)
diff --git a/build.gradle.kts b/build.gradle.kts
index f87790c1c..66e9b0d94 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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"
+	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 {
@@ -173,7 +173,7 @@ signing {
 }
 
 nexusPublishing {
-	this.repositories {
+	repositories {
 		sonatype()
 	}
 }
@@ -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 {
@@ -198,11 +197,6 @@ tasks {
 			runtimeClasspath += sourceSets.main.get().output
 		}
 	}
-	project(":demo") {
-		this.sonar {
-			isSkipProject = true
-		}
-	}
 	// Adds all dependencies of main to demo sourceSet
 	configurations["demoImplementation"].extendsFrom(configurations.testImplementation.get())
 	// Ensures JUnit 5 engine is available to demo at runtime
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c4..d64cd4917 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3fa8f862f..1af9e0930 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 81d11bd72..e46b223c2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,8 +1,8 @@
 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 { 
@@ -10,4 +10,10 @@ gradleEnterprise {
 		termsOfServiceUrl = "https://gradle.com/terms-of-service"
 		termsOfServiceAgree = "yes"
 	}
-}
\ No newline at end of file
+}
+
+// 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")
diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java
index 1d650ba2b..cba8b7d41 100644
--- a/src/test/java/module-info.java
+++ b/src/test/java/module-info.java
@@ -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;