Updating to Gradle 7 and RSTA 3.1.3-SNAPSHOT

RSTAUI/build.gradle

@@ -9,9 +9,9 @@ assert JavaVersion.current().isJava8Compatible()
 archivesBaseName = 'rstaui'
 
 dependencies {
-    api 'com.fifesoft:rsyntaxtextarea:3.1.2'
-    api 'com.fifesoft:autocomplete:3.1.1'
-    testImplementation 'junit:junit:4.13.1'
+    api 'com.fifesoft:rsyntaxtextarea:3.1.3-SNAPSHOT'
+    api 'com.fifesoft:autocomplete:3.1.2-SNAPSHOT'
+    testImplementation 'junit:junit:4.13.2'
 }
 
 ext.isReleaseVersion = !project.version.endsWith('SNAPSHOT')
@@ -33,42 +33,6 @@ jar {
 	manifest { from sharedManifest }
 }
 
-// We use "distributions" to create the zip files uploaded to SourceForge
-distributions {
-	main {
-        distributionBaseName = 'rstaui'
-		contents {
-			from { [ 'build/libs' ] }
-			rename 'RSTAUI-.*\\.jar', 'rstaui.jar'
-		}
-	}
-	src {
-        distributionBaseName = 'rstaui'
-	}
-}
-distZip.classifier = null
-distZip.dependsOn jar
-srcDistZip.classifier = 'src'
-srcDistZip {
-	from projectDir
-	include 'src/**/*'
-	include 'build.gradle'
-	include '.classpath'
-	include '.project'
-	include 'gradle.properties'
-	include 'gradle/**/*'
-	include 'gradlew*'
-	include 'README.md'
-	include '.settings/**'
-}
-
-task buildSourceForgeZips {
-    doLast {
-        println 'Building zip files for SourceForge'
-    }
-}
-buildSourceForgeZips.dependsOn clean, jar, distZip, srcDistZip
-
 publishing {
     repositories {
         maven {

build.gradle

@@ -1,9 +1,9 @@
 plugins {
-    id 'com.github.spotbugs' version '4.6.0'
+    id 'com.github.spotbugs' version '4.7.1'
 }
 
 group 'com.fifesoft'
-// NOTE: Local Java 8:  /Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home
+// NOTE: Local Java 8:  /Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home
 
 allprojects {
 
@@ -16,7 +16,7 @@ allprojects {
     }
 
     wrapper {
-        gradleVersion = '6.7.1'
+        gradleVersion = '7.0.2'
     }
 }
 
@@ -27,7 +27,7 @@ subprojects {
     apply plugin: 'com.github.spotbugs'
 
     checkstyle {
-        toolVersion = '8.37'
+        toolVersion = '8.43'
     }
 
     spotbugsMain {
@@ -52,8 +52,8 @@ subprojects {
     }
 
     compileJava {
-        sourceCompatibility javaVersion
-        targetCompatibility javaVersion
+        sourceCompatibility javaVersion.toString()
+        targetCompatibility javaVersion.toString()
         options.debug = true
         options.debugOptions.debugLevel = 'source,vars,lines'
         options.compilerArgs << '-Xlint:deprecation' << '-Xlint:unchecked'

gradle.properties

@@ -1,3 +1,6 @@
 # Note that Maven- and signing-related properties are in <maven-home>/gradle.properties
 javaVersion=1.8
 version=3.1.2-SNAPSHOT
+
+# Ugh, see https://github.com/gradle/gradle/issues/11308
+systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists