Skip to content

Commit

Permalink
Feature/scala3 conversion (#90)
Browse files Browse the repository at this point in the history
* Convert to scala 3 format

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>

* lint fixes

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>

---------

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
  • Loading branch information
prabhu authored Nov 10, 2023
1 parent 07f3772 commit a251ac1
Show file tree
Hide file tree
Showing 20 changed files with 2,750 additions and 2,591 deletions.
15 changes: 12 additions & 3 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
version = 3.5.1
version = 3.7.15
runner.dialect = scala3
preset = IntelliJ
maxColumn = 120
align.preset = true
maxColumn = 100
align.preset = true

indent.main = 4

newlines.source = keep
rewrite.scala3.convertToNewSyntax = true
rewrite.scala3.removeOptionalBraces = yes
rewrite.scala3.insertEndMarkerMinLines = 20
rewrite.scala3.removeEndMarkerMaxLines = 18

6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name := "atom"
ThisBuild / organization := "io.appthreat"
ThisBuild / version := "1.5.7"
ThisBuild / version := "1.6.0"
ThisBuild / scalaVersion := "3.3.1"

val chenVersion = "0.6.3"
val chenVersion = "1.0.0"

lazy val atom = Projects.atom

Expand Down Expand Up @@ -170,6 +170,8 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
Compile / doc / sources := Seq.empty
Compile / packageDoc / publishArtifact := false

wartremoverWarnings ++= Seq(Wart.NoNeedImport, Wart.ArrayEquals, Wart.Any, Wart.FinalCaseClass, Wart.FinalVal, Wart.ToString, Wart.TryPartial)

githubOwner := "appthreat"
githubRepository := "atom"
githubSuppressPublicationWarning := true
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("io.shiftleft" % "sbt-overflowdb" % "2.29")
addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.2")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.1.5")
Loading

0 comments on commit a251ac1

Please # to comment.