From 61aeefb359497a8809d31d60371f85da1d7b3c5b Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Mon, 20 Jan 2025 15:10:57 +0200
Subject: [PATCH 01/16] TCE-1032: Update to version 0.10.0
---
.circleci/config.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 48c21ef..472cf0b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,8 @@
version: 2.1
orbs:
- codacy: codacy/base@10.2.2
- codacy_plugins_test: codacy/plugins-test@1.1.1
+ codacy: codacy/base@12.1.4
+ codacy_plugins_test: codacy/plugins-test@2.0.11
workflows:
version: 2
From 0ad5f8a2d908359f1e184ee06240ebeade957cea Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Mon, 20 Jan 2025 15:16:36 +0200
Subject: [PATCH 02/16] update versions
---
.scalafmt.conf | 2 +-
build.sbt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index df338e7..be2161a 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "1.5.1"
+version = "3.8.5"
style = IntelliJ
align = none
diff --git a/build.sbt b/build.sbt
index c31cb86..f3d71e6 100755
--- a/build.sbt
+++ b/build.sbt
@@ -2,9 +2,9 @@ organization := "com.codacy"
name := "codacy-shellcheck"
-scalaVersion := "2.13.3"
+scalaVersion := "2.13.16"
-libraryDependencies += "com.codacy" %% "codacy-engine-scala-seed" % "4.1.1"
+libraryDependencies += "com.codacy" %% "codacy-engine-scala-seed" % "6.1.3"
enablePlugins(GraalVMNativeImagePlugin)
From 4a89e75a988ff2fb7a926ec6de240767bb8575d6 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Mon, 20 Jan 2025 15:22:13 +0200
Subject: [PATCH 03/16] update SBT
---
project/build.properties | 2 +-
project/plugins.sbt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/project/build.properties b/project/build.properties
index 0837f7a..73df629 100755
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.10.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4c2c990..048aea1 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "20.0.7")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
+addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.2")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.11.0")
From ad22e892d596c5dbbe4be2361c6027ee6b217260 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Mon, 20 Jan 2025 15:24:58 +0200
Subject: [PATCH 04/16] update sbt-native-packager
---
project/plugins.sbt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 048aea1..6012860 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.11.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.10.4")
From c2f72cac648298e07ef9d45b199e6fe7231b0ddd Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Mon, 20 Jan 2025 15:33:10 +0200
Subject: [PATCH 05/16] update sbt
---
project/build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/build.properties b/project/build.properties
index 73df629..04267b1 100755
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.9.9
From c31074b331beee3ff6f7e21fb1c60da3ce78d96b Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Mon, 20 Jan 2025 15:39:03 +0200
Subject: [PATCH 06/16] update sbt native
---
project/plugins.sbt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6012860..1a05235 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.10.4")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.9.1")
From 15504699d846b5490ca51589ca8b9009a0f6d132 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Mon, 20 Jan 2025 15:43:02 +0200
Subject: [PATCH 07/16] update sbt plugin
---
project/plugins.sbt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 1a05235..075d5ff 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.9.1")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.1")
From 8a3c59365c367596b8f10c7a71cbd8fedb0ff654 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Mon, 20 Jan 2025 15:52:43 +0200
Subject: [PATCH 08/16] update scalafmt
---
.scalafmt.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index be2161a..df338e7 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.5"
+version = "1.5.1"
style = IntelliJ
align = none
From f6762689169a53fba351ae0520db447aaa90ce6e Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Tue, 21 Jan 2025 16:39:38 +0200
Subject: [PATCH 09/16] update sbt commands
---
.circleci/config.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 472cf0b..644bd62 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,10 +13,10 @@ workflows:
- codacy/sbt:
name: publish_docker_local
cmd: |
- sbt "scalafmt::test;
- test:scalafmt::test;
- sbt:scalafmt::test;
- universal:stage;
+ sbt "scalafmtCheckAll;
+ test:scalafmt;
+ scalafmt;
+ universal:stage
graalvm-native-image:packageBin"
docker build -t $CIRCLE_PROJECT_REPONAME:latest .
docker save --output docker-image.tar $CIRCLE_PROJECT_REPONAME:latest
From afb26cbd6a0e2e31efa954715a781da971b01841 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Tue, 21 Jan 2025 16:47:40 +0200
Subject: [PATCH 10/16] update3
---
.circleci/config.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 644bd62..2f9c7df 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ workflows:
sbt "scalafmtCheckAll;
test:scalafmt;
scalafmt;
- universal:stage
+ universal:stage;
graalvm-native-image:packageBin"
docker build -t $CIRCLE_PROJECT_REPONAME:latest .
docker save --output docker-image.tar $CIRCLE_PROJECT_REPONAME:latest
From 9736048c444deaa10e586eaad32b11b45c4316c4 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Tue, 21 Jan 2025 16:51:23 +0200
Subject: [PATCH 11/16] add better files
---
project/plugins.sbt | 1 +
1 file changed, 1 insertion(+)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 075d5ff..a6653ec 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,3 @@
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.2")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.1")
+addSbtPlugin("com.github.pathikrit" % "better-files" % "3.9.1")
\ No newline at end of file
From 5cc2448bdcd34f58e0705a16dcf1f9b3bcee8055 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Tue, 21 Jan 2025 17:06:05 +0200
Subject: [PATCH 12/16] update6
---
build.sbt | 5 ++++-
project/build.properties | 2 +-
project/plugins.sbt | 3 +--
src/main/scala/codacy/shellcheck/ShellCheck.scala | 2 --
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.sbt b/build.sbt
index f3d71e6..d35734f 100755
--- a/build.sbt
+++ b/build.sbt
@@ -4,7 +4,10 @@ name := "codacy-shellcheck"
scalaVersion := "2.13.16"
-libraryDependencies += "com.codacy" %% "codacy-engine-scala-seed" % "6.1.3"
+libraryDependencies ++= Seq(
+ "com.codacy" %% "codacy-engine-scala-seed" % "6.1.3",
+ "com.github.pathikrit" %% "better-files" % "3.9.1"
+)
enablePlugins(GraalVMNativeImagePlugin)
diff --git a/project/build.properties b/project/build.properties
index 04267b1..72413de 100755
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.8.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
index a6653ec..67a504e 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,2 @@
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.2")
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.1")
-addSbtPlugin("com.github.pathikrit" % "better-files" % "3.9.1")
\ No newline at end of file
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.1")
\ No newline at end of file
diff --git a/src/main/scala/codacy/shellcheck/ShellCheck.scala b/src/main/scala/codacy/shellcheck/ShellCheck.scala
index c259a2f..f7d4061 100755
--- a/src/main/scala/codacy/shellcheck/ShellCheck.scala
+++ b/src/main/scala/codacy/shellcheck/ShellCheck.scala
@@ -1,8 +1,6 @@
package codacy.shellcheck
import java.io.{File => JFile}
-
-import better.files._
import com.codacy.plugins.api._
import com.codacy.plugins.api.results.{Pattern, Result, Tool}
import com.codacy.tools.scala.seed.utils._
From 42b75412c6a0129d255c7a9c135f14c3a18d7f3c Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Tue, 21 Jan 2025 17:11:33 +0200
Subject: [PATCH 13/16] update7
---
project/build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project/build.properties b/project/build.properties
index 72413de..40b3b8e 100755
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.3
+sbt.version=1.9.0
From 51339163247005c7c00663c47b212d7a24b0d566 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Tue, 21 Jan 2025 17:21:03 +0200
Subject: [PATCH 14/16] update7
---
src/main/scala/codacy/shellcheck/ShellCheck.scala | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/scala/codacy/shellcheck/ShellCheck.scala b/src/main/scala/codacy/shellcheck/ShellCheck.scala
index f7d4061..c259a2f 100755
--- a/src/main/scala/codacy/shellcheck/ShellCheck.scala
+++ b/src/main/scala/codacy/shellcheck/ShellCheck.scala
@@ -1,6 +1,8 @@
package codacy.shellcheck
import java.io.{File => JFile}
+
+import better.files._
import com.codacy.plugins.api._
import com.codacy.plugins.api.results.{Pattern, Result, Tool}
import com.codacy.tools.scala.seed.utils._
From 8d001c5f293c0a2e75d939f826c54e70d52f5e06 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Tue, 21 Jan 2025 17:23:43 +0200
Subject: [PATCH 15/16] update 8
---
src/main/scala/codacy/shellcheck/ShellCheck.scala | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/scala/codacy/shellcheck/ShellCheck.scala b/src/main/scala/codacy/shellcheck/ShellCheck.scala
index c259a2f..669a209 100755
--- a/src/main/scala/codacy/shellcheck/ShellCheck.scala
+++ b/src/main/scala/codacy/shellcheck/ShellCheck.scala
@@ -1,20 +1,18 @@
package codacy.shellcheck
import java.io.{File => JFile}
-
-import better.files._
import com.codacy.plugins.api._
import com.codacy.plugins.api.results.{Pattern, Result, Tool}
import com.codacy.tools.scala.seed.utils._
import com.codacy.tools.scala.seed.utils.ToolHelper._
-import play.api.libs.json.Json
+import play.api.libs.json.{Json, OFormat}
import scala.util.Try
case class ShellCheckResult(file: String, line: Int, column: Int, level: String, code: Int, message: String)
object ShellCheckResult {
- implicit val shellCheckResult = Json.format[ShellCheckResult]
+ implicit val shellCheckResult: OFormat[ShellCheckResult] = Json.format[ShellCheckResult]
}
object ShellCheck extends Tool {
From b6b878038c9321a8bd3af39a116a9614c4147d48 Mon Sep 17 00:00:00 2001
From: Stefan Vacareanu <stefan@codacy.com>
Date: Tue, 21 Jan 2025 17:31:12 +0200
Subject: [PATCH 16/16] update8
---
project/plugins.sbt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 67a504e..a6653ec 100755
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,3 @@
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.2")
-addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.1")
\ No newline at end of file
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.1")
+addSbtPlugin("com.github.pathikrit" % "better-files" % "3.9.1")
\ No newline at end of file