Scalafmt 2.7.5 (#40)

* chore(deps): scalafmt 2.7.5 * chore(deps): Gradle 6.8.3 * chore: Gradle deprecation message elimindated Fixes #39 Co-authored-by: Michal Augustýn <michal.augustyn@avast.com>
alenkacz · Apr 12, 2021 · 2991939 · 2991939
1 parent fd461b4
commit 2991939
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 33 deletions.
diff --git a/build.gradle b/build.gradle
@@ -30,7 +30,7 @@ repositories {
 
 dependencies {
     compile gradleApi()
-    compile 'org.scalameta:scalafmt-dynamic_2.12:2.4.2'
+    compile 'org.scalameta:scalafmt-dynamic_2.12:2.7.5'
     compile 'org.scala-lang.modules:scala-xml_2.12:1.3.0'
 
     testCompile 'junit:junit:4.13'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
diff --git a/src/main/groovy/cz/alenkacz/gradle/scalafmt/PluginExtension.groovy b/src/main/groovy/cz/alenkacz/gradle/scalafmt/PluginExtension.groovy
@@ -1,9 +1,5 @@
 package cz.alenkacz.gradle.scalafmt
 
 class PluginExtension {
-    def String configFilePath
-
-    public PluginExtension() {
-        configFilePath = ".scalafmt.conf"
-    }
+    String configFilePath = ".scalafmt.conf"
 }
diff --git a/src/main/groovy/cz/alenkacz/gradle/scalafmt/ScalafmtFormatBase.groovy b/src/main/groovy/cz/alenkacz/gradle/scalafmt/ScalafmtFormatBase.groovy
@@ -3,20 +3,22 @@ package cz.alenkacz.gradle.scalafmt
 import org.gradle.api.DefaultTask
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.SourceSet
+import org.scalafmt.dynamic.ScalafmtDynamicError
 import org.scalafmt.interfaces.Scalafmt
 
 class ScalafmtFormatBase extends DefaultTask {
     SourceSet sourceSet
-    ClassLoader cl = this.class.getClassLoader()
-    PluginExtension pluginExtension
+    private ClassLoader cl = this.class.getClassLoader()
+    @Internal PluginExtension pluginExtension
 
-    def globalFormatter = Scalafmt.create(cl)
+    private Scalafmt globalFormatter = Scalafmt.create(cl)
             .withRespectVersion(false)
-            .withDefaultVersion("1.5.1")
+            .withDefaultVersion("2.7.5")
 
     @InputFiles
     @PathSensitive(PathSensitivity.RELATIVE)
@@ -42,13 +44,18 @@ class ScalafmtFormatBase extends DefaultTask {
         getSourceSet().filter { File f -> canBeFormatted(f) }.each { File f ->
             String contents = f.text
             logger.debug("Formatting '$f'")
-            def formattedContents = formatter.format(configpath.toPath(), f.toPath(), contents)
-            if (testOnly) {
-                if (contents != formattedContents) {
-                    misformattedFiles.add(f.absolutePath)
+            try {
+                def formattedContents = formatter.format(configpath.toPath(), f.toPath(), contents)
+                if (testOnly) {
+                    if (contents != formattedContents) {
+                        misformattedFiles.add(f.absolutePath)
+                    }
+                } else {
+                    f.write(formattedContents)
                 }
-            } else {
-                f.write(formattedContents)
+            }
+            catch (ScalafmtDynamicError err) {
+                logger.lifecycle("Error while formatting", err)
             }
         }
 

diff --git a/src/main/groovy/cz/alenkacz/gradle/scalafmt/ScalafmtPlugin.groovy b/src/main/groovy/cz/alenkacz/gradle/scalafmt/ScalafmtPlugin.groovy
@@ -17,17 +17,17 @@ class ScalafmtPlugin implements Plugin<Project> {
         project.plugins.withType(JavaBasePlugin) {
             def jpc = project.convention.getPlugin(JavaPluginConvention)
             jpc.sourceSets.all { sourceSet ->
-                def task = project.tasks.create(sourceSet.getTaskName("", "scalafmt"), ScalafmtTask).configure { Task t ->
-                    t.sourceSet = sourceSet
-                    t.pluginExtension = extension
-                    t.description = "Formats ${sourceSet.name} source set using scalafmt."
-                }
+                def task = project.tasks.register(sourceSet.getTaskName("", "scalafmt"), ScalafmtTask, {
+                    it.sourceSet = sourceSet
+                    it.pluginExtension = extension
+                    it.description = "Formats ${sourceSet.name} source set using scalafmt."
+                })
 
-                def checkTask = project.tasks.create(sourceSet.getTaskName("check", "scalafmt"), ScalafmtCheckTask).configure { Task t ->
-                    t.sourceSet = sourceSet
-                    t.pluginExtension = extension
-                    t.description = "Checks formatting of ${sourceSet.name} source set using scalafmt."
-                }
+                def checkTask = project.tasks.register(sourceSet.getTaskName("check", "scalafmt"), ScalafmtCheckTask, {
+                    it.sourceSet = sourceSet
+                    it.pluginExtension = extension
+                    it.description = "Checks formatting of ${sourceSet.name} source set using scalafmt."
+                })
                 scalafmtAll.dependsOn task
                 checkScalafmtAll.dependsOn checkTask
             }

diff --git a/src/test/groovy/cz/alenkacz/gradle/scalafmt/ScalafmtTaskTest.groovy b/src/test/groovy/cz/alenkacz/gradle/scalafmt/ScalafmtTaskTest.groovy
@@ -19,8 +19,10 @@ class ScalafmtTaskTest extends Specification {
         def actual = testProject.testFile.text
         actual == """import java.nio.file.{Paths, Files}
                      |object Test {
-                     |  foo(a, // comment
-                     |      b)
+                     |  foo(
+                     |    a, // comment
+                     |    b
+                     |  )
                      |}
                      |""".stripMargin()
     }
@@ -50,8 +52,10 @@ class ScalafmtTaskTest extends Specification {
         def actual = testProject.testFile.text
         actual == """import java.nio.file.{Files, Paths}
                      |object Test {
-                     |  foo(a, // comment
-                     |      b)
+                     |  foo(
+                     |    a, // comment
+                     |    b
+                     |  )
                      |}
                      |""".stripMargin()
     }
@@ -86,8 +90,10 @@ class ScalafmtTaskTest extends Specification {
         def actual = testProject.testFile.text
         actual == """import java.nio.file.{Files, Paths}
                      |object Test {
-                     |  foo(a, // comment
-                     |      b)
+                     |  foo(
+                     |    a, // comment
+                     |    b
+                     |  )
                      |}
                      |""".stripMargin()
     }