diff --git a/RSyntaxTextArea/build.gradle b/RSyntaxTextArea/build.gradle
index 0cbcef8b3..3497db2e3 100755
--- a/RSyntaxTextArea/build.gradle
+++ b/RSyntaxTextArea/build.gradle
@@ -1,6 +1,6 @@
 import static org.gradle.api.JavaVersion.*
 
-['jacoco', 'biz.aQute.bnd.builder', 'distribution', 'maven-publish', 'signing'].each { apply plugin: it }
+['base', 'jacoco', 'biz.aQute.bnd.builder', 'distribution', 'maven-publish', 'signing'].each { apply plugin: it }
 
 // We require building with JDK 8 or later.  We turn off doclint since our
 // generated *TokenMakers have horrible documentation (see https://github.com/jflex-de/jflex/issues/182)
@@ -11,7 +11,9 @@ allprojects {
 	}
 }
 
-archivesBaseName = 'rsyntaxtextarea'
+base {
+    archivesName = 'rsyntaxtextarea'
+}
 ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')
 
 jacocoTestReport {
@@ -21,23 +23,21 @@ jacocoTestReport {
 	}
 }
 
-ext.sharedManifest = manifest {
-	attributes('Specification-Title': 'RSyntaxTextArea',
-		'Automatic-Module-Name': 'org.fife.RSyntaxTextArea', // jdk 9+ module name
-		'Specification-Version': version,
-		'Implementation-Title': 'org.fife.ui',
-		'Implementation-Version': version,
-		'Bundle-License': 'BSD-3-Clause',
-		// Not sure why Require-Capability is not being added by the osgi plugin...
-		'Require-Capability': 'osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=' + javaVersion + '))"')
-}
-
 java {
     withSourcesJar()
     withJavadocJar()
 }
 jar {
-	manifest { from sharedManifest }
+    manifest {
+        attributes('Specification-Title': 'RSyntaxTextArea',
+                'Automatic-Module-Name': 'org.fife.RSyntaxTextArea', // jdk 9+ module name
+                'Specification-Version': version,
+                'Implementation-Title': 'org.fife.ui',
+                'Implementation-Version': version,
+                'Bundle-License': 'BSD-3-Clause',
+                // Not sure why Require-Capability is not being added by the osgi plugin...
+                'Require-Capability': 'osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=' + javaVersion + '))"')
+    }
 }
 test {
     testLogging {
diff --git a/RSyntaxTextAreaDemo/build.gradle b/RSyntaxTextAreaDemo/build.gradle
index 01816b904..28a3de0d2 100755
--- a/RSyntaxTextAreaDemo/build.gradle
+++ b/RSyntaxTextAreaDemo/build.gradle
@@ -1,8 +1,12 @@
 plugins {
     id 'application'
+    id 'base'
+}
+
+base {
+    archivesName = 'rstademo'
 }
 
-archivesBaseName = 'rstademo'
 
 dependencies {
     implementation project(':RSyntaxTextArea')
diff --git a/build.gradle b/build.gradle
index 7a21bc860..33d7572db 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ allprojects {
     }
 
     wrapper {
-        gradleVersion = '8.2'
+        gradleVersion = '8.2.1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 62f495dfe..9f4197d5f 100755
--- 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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME