chore: deprecations handled

augi · Dec 22, 2023 · d87a20a · d87a20a
1 parent 64bef9f
commit d87a20a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,7 +34,9 @@ test {
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}
 
 project.ext.set('gradle.publish.key', System.getenv('GRADLE_PORTAL_KEY'))
 project.ext.set('gradle.publish.secret', System.getenv('GRADLE_PORTAL_SECRET'))

diff --git a/src/main/groovy/cz/augi/gradle/scalafmt/ScalafmtPlugin.groovy b/src/main/groovy/cz/augi/gradle/scalafmt/ScalafmtPlugin.groovy
@@ -4,7 +4,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.plugins.JavaBasePlugin
-import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.plugins.JavaPluginExtension
 
 class ScalafmtPlugin implements Plugin<Project> {
     @Override
@@ -14,9 +14,8 @@ class ScalafmtPlugin implements Plugin<Project> {
         Task checkScalafmtAll = project.tasks.create('checkScalafmtAll')
         checkScalafmtAll.description = "Checks formatting of all source sets using scalafmt."
         PluginExtension extension = project.extensions.create('scalafmt', PluginExtension)
-        project.plugins.withType(JavaBasePlugin) {
-            def jpc = project.convention.getPlugin(JavaPluginConvention)
-            jpc.sourceSets.all { sourceSet ->
+        project.plugins.withType(JavaBasePlugin).configureEach {
+            project.extensions.getByType(JavaPluginExtension).sourceSets.configureEach { sourceSet ->
                 def task = project.tasks.register(sourceSet.getTaskName("", "scalafmt"), ScalafmtTask, {
                     it.sourceSet = sourceSet
                     it.pluginExtension = extension