chore: fix some warnings

5 files changed, 40 insertions, 35 deletions

diff --git a/buildSrc/src/main/groovy/refinery-eclipse.gradle b/buildSrc/src/main/groovy/refinery-eclipse.gradle
index ec8b9f6c..15dcb5ce 100644
--- a/buildSrc/src/main/groovy/refinery-eclipse.gradle
+++ b/buildSrc/src/main/groovy/refinery-eclipse.gradle
@@ -5,19 +5,20 @@ plugins {
 // Workaround from https://github.com/gradle/gradle/issues/898#issuecomment-885765821
 def eclipseResourceEncoding = tasks.register('eclipseResourceEncoding') {
         ext.outputFile = file('.settings/org.eclipse.core.resources.prefs')
-    def compileTask = tasks.findByName('compileJava')
-    ext.encoding = provider({ compileTask?.options?.encoding }).orElse(providers.systemProperty('file.encoding'))
+        def compileTask = tasks.findByName('compileJava')
+        ext.encoding = provider({ compileTask?.options?.encoding }).orElse(providers.systemProperty('file.encoding'))
 
-    inputs.property("file.encoding", encoding)
-    outputs.file(outputFile).withPropertyName('outputFile')
+        inputs.property('file.encoding', encoding)
+        outputs.file(outputFile).withPropertyName('outputFile')
 
-    doLast {
-        Properties eclipseEncodingProperties = new Properties(Collections.singletonMap('eclipse.preferences.version','1'))
-        eclipseEncodingProperties.put('encoding/<project>', encoding.get())
-        outputFile.withOutputStream {
-                eclipseEncodingProperties.store(it, 'generated by ' + name)
-        }
-    }
+        doLast {
+                Properties eclipseEncodingProperties =
+                                new Properties(Collections.singletonMap('eclipse.preferences.version', '1'))
+                eclipseEncodingProperties.put('encoding/<project>', encoding.get())
+                outputFile.withOutputStream {
+                        eclipseEncodingProperties.store(it, 'generated by ' + name)
+                }
+        }
 }
 
 tasks.named('eclipse') {
diff --git a/buildSrc/src/main/groovy/refinery-frontend-worktree.gradle b/buildSrc/src/main/groovy/refinery-frontend-worktree.gradle
index e1324746..1d239fd5 100644
--- a/buildSrc/src/main/groovy/refinery-frontend-worktree.gradle
+++ b/buildSrc/src/main/groovy/refinery-frontend-worktree.gradle
@@ -14,13 +14,13 @@ frontend {
 
 ext.frontedPropertiesFile = "${frontend.nodeInstallDirectory.get()}/frontend.properties"
 
-def String getFrontendProperty(String propertyName) {
+String getFrontendProperty(String propertyName) {
         FileInputStream inputStream = null
         Properties props = new Properties()
         try {
                 inputStream = new FileInputStream(frontedPropertiesFile)
                 props.load(inputStream)
-        } catch (FileNotFoundException | IOException e) {
+        } catch (IOException ignored) {
                 return null
         } finally {
                 if (inputStream != null) {
@@ -30,13 +30,13 @@ def String getFrontendProperty(String propertyName) {
         return props.get(propertyName)
 }
 
-def String putFrontedProperty(String propertyName, String propertyValue) {
+void putFrontedProperty(String propertyName, String propertyValue) {
         FileInputStream inputStream = null
         Properties props = new Properties()
         try {
                 inputStream = new FileInputStream(frontedPropertiesFile)
                 props.load(inputStream)
-        } catch (FileNotFoundException e) {
+        } catch (FileNotFoundException ignored) {
                 // Use an empty Properties object instead
         } finally {
                 if (inputStream != null) {
@@ -48,8 +48,7 @@ def String putFrontedProperty(String propertyName, String propertyValue) {
         try {
                 outputStream = new FileOutputStream(frontedPropertiesFile)
                 props.store(outputStream, null)
-        } catch (IOException e) {
-                return true;
+        } catch (IOException ignored) {
         } finally {
                 if (outputStream != null) {
                         outputStream.close()
diff --git a/buildSrc/src/main/groovy/refinery-java-conventions.gradle b/buildSrc/src/main/groovy/refinery-java-conventions.gradle
index bbdaa86c..b95153ce 100644
--- a/buildSrc/src/main/groovy/refinery-java-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-java-conventions.gradle
@@ -20,8 +20,9 @@ dependencies {
         testImplementation libs.mockito.junit
 }
 
-sourceCompatibility = '17'
-targetCompatibility = '17'
+java.toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+}
 
 def jacocoTestReport = tasks.named('jacocoTestReport')
 jacocoTestReport.configure {
@@ -46,8 +47,8 @@ tasks.register('slowTest', Test) {
 tasks.named('jar') {
         manifest {
                 attributes(
-                        'Bundle-SymbolicName': "${project.group}.${project.name}",
-                        'Bundle-Version': project.version
+                                'Bundle-SymbolicName': "${project.group}.${project.name}",
+                                'Bundle-Version': project.version
                 )
         }
 }
@@ -70,7 +71,7 @@ eclipse {
                                 entry.entryAttributes['ignore_optional_problems'] = true
                         }
                         // If a project has a main dependency on a project and an test dependency on the testFixtures of a project,
-                        // it will be errorneously added as a test-only dependency to Eclipse.
+                        // it will be erroneously added as a test-only dependency to Eclipse.
                         // As a workaround, we add all project dependencies as main dependencies
                         // (we do not deliberately use test-only project dependencies).
                         if (entry in org.gradle.plugins.ide.eclipse.model.ProjectDependency) {
@@ -80,7 +81,7 @@ eclipse {
         }
 
         jdt.file.withProperties { properties ->
-                // Allow @SupperessWarnings to suppress SonarLint warnings
+                // Allow @SuppressWarnings to suppress SonarLint warnings
                 properties['org.eclipse.jdt.core.compiler.problem.unhandledWarningToken'] = 'ignore'
         }
 }
diff --git a/buildSrc/src/main/groovy/refinery-java-test-fixtures.gradle b/buildSrc/src/main/groovy/refinery-java-test-fixtures.gradle
index 693cba98..02568abd 100644
--- a/buildSrc/src/main/groovy/refinery-java-test-fixtures.gradle
+++ b/buildSrc/src/main/groovy/refinery-java-test-fixtures.gradle
@@ -1,3 +1,5 @@
+import org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry
+
 plugins {
         id 'java-test-fixtures'
         id 'refinery-java-conventions'
@@ -8,15 +10,15 @@ eclipse.classpath {
 
         file.whenMerged { classpath ->
                 def hasTest = classpath.entries.any { entry ->
-                        entry in org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry &&
-                        entry.entryAttributes['gradle_scope'] == 'test'
+                        entry in AbstractClasspathEntry &&
+                                        entry.entryAttributes['gradle_scope'] == 'test'
                 }
                 for (entry in classpath.entries) {
                         // Workaround https://github.com/gradle/gradle/issues/11845 based on
                         // https://discuss.gradle.org/t/gradle-used-by-scope-not-correctly-generated-when-the-java-test-fixtures-plugin-is-used/39935/2
-                        if (entry in org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry) {
+                        if (entry in AbstractClasspathEntry) {
                                 def usedBy = new LinkedHashSet(
-                                        Arrays.asList((entry.entryAttributes['gradle_used_by_scope'] ?: '').split(','))
+                                                Arrays.asList((entry.entryAttributes['gradle_used_by_scope'] ?: '').split(','))
                                 )
                                 if (usedBy.contains('main')) {
                                         usedBy += 'testFixtures'
diff --git a/buildSrc/src/main/groovy/refinery-jmh.gradle b/buildSrc/src/main/groovy/refinery-jmh.gradle
index 538159a4..1ab9edc3 100644
--- a/buildSrc/src/main/groovy/refinery-jmh.gradle
+++ b/buildSrc/src/main/groovy/refinery-jmh.gradle
@@ -1,3 +1,5 @@
+import org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry
+
 plugins {
         id 'refinery-java-conventions'
         id 'refinery-sonarqube'
@@ -12,9 +14,9 @@ configurations {
 sourceSets {
         jmh {
                 java.srcDirs = ['src/jmh/java']
-        resources.srcDirs = ['src/jmh/resources']
-        compileClasspath += sourceSets.main.runtimeClasspath
-        compileClasspath += sourceSets.test.runtimeClasspath
+                resources.srcDirs = ['src/jmh/resources']
+                compileClasspath += sourceSets.main.runtimeClasspath
+                compileClasspath += sourceSets.test.runtimeClasspath
         }
 }
 
@@ -25,13 +27,13 @@ dependencies {
 
 tasks.register('jmh', JavaExec) {
         dependsOn tasks.named('jmhClasses')
-    mainClass = 'org.openjdk.jmh.Main'
-    classpath = sourceSets.jmh.compileClasspath + sourceSets.jmh.runtimeClasspath
+        mainClass = 'org.openjdk.jmh.Main'
+        classpath = sourceSets.jmh.compileClasspath + sourceSets.jmh.runtimeClasspath
 }
 
 eclipse.classpath.file.whenMerged { classpath ->
         for (entry in classpath.entries) {
-                if (entry in org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry) {
+                if (entry in AbstractClasspathEntry) {
                         // Workaround from https://github.com/gradle/gradle/issues/4802#issuecomment-407902081
                         if (entry.entryAttributes['gradle_scope'] == 'jmh') {
                                 // Allow test helper classes to be used in benchmarks from Eclipse
@@ -41,7 +43,7 @@ eclipse.classpath.file.whenMerged { classpath ->
                                 // Workaround based on
                                 // https://discuss.gradle.org/t/gradle-used-by-scope-not-correctly-generated-when-the-java-test-fixtures-plugin-is-used/39935/2
                                 def usedBy = new LinkedHashSet(
-                                        Arrays.asList((entry.entryAttributes['gradle_used_by_scope'] ?: '').split(','))
+                                                Arrays.asList((entry.entryAttributes['gradle_used_by_scope'] ?: '').split(','))
                                 )
                                 if (['main', 'test', 'testFixtures'].any { e -> usedBy.contains(e) }) {
                                         // main and test sources are also used by jmh sources.
@@ -57,6 +59,6 @@ eclipse.classpath.file.whenMerged { classpath ->
 
 sonarqube.properties {
         properties['sonar.tests'] += [
-                'src/jmh/java',
+                        'src/jmh/java',
         ]
 }