From 943ca0d42e1f3fb569cb261379c592dc992c933e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 4 Jul 2021 18:31:15 +0200 Subject: [PATCH 1/2] Update scalafmt-core to 3.0.0-RC6 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index fd178a1..4073d11 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.0.0-RC5 +version = 3.0.0-RC6 project.git = true maxColumn = 120 From 2d744f5887ac59c6424482b24f59cb02075ebbe6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 4 Jul 2021 18:31:24 +0200 Subject: [PATCH 2/2] Reformat with scalafmt 3.0.0-RC6 --- build.sbt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 41aa421..0f17757 100644 --- a/build.sbt +++ b/build.sbt @@ -1,14 +1,14 @@ -name := "scaldi-jsr330" +name := "scaldi-jsr330" organization := "org.scaldi" description := "scaldi-jsr330 - JSR 330 spec implementation for scaldi" -homepage := Some(url("https://github.com/scaldi/scaldi-jsr330")) +homepage := Some(url("https://github.com/scaldi/scaldi-jsr330")) licenses := Seq( "Apache License, ASL Version 2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0") ) -scalaVersion := "2.13.6" -crossScalaVersions := Seq("2.11.12", "2.12.14", "2.13.6") +scalaVersion := "2.13.6" +crossScalaVersions := Seq("2.11.12", "2.12.14", "2.13.6") mimaPreviousArtifacts := Set("0.6.0").map(organization.value %% name.value % _) scalacOptions ++= Seq("-deprecation", "-feature") crossPaths := false @@ -25,13 +25,13 @@ git.remoteRepo := "git@github.com:scaldi/scaldi-jsr330.git" // Publishing -pomIncludeRepository := (_ => false) +pomIncludeRepository := (_ => false) Test / publishArtifact := false ThisBuild / githubWorkflowTargetTags ++= Seq("v*") ThisBuild / githubWorkflowScalaVersions := crossScalaVersions.value ThisBuild / githubWorkflowJavaVersions ++= Seq("adopt@1.11") ThisBuild / githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))) -ThisBuild / githubWorkflowBuildPreamble := Seq(WorkflowStep.Sbt(List("scalafmtCheckAll"))) +ThisBuild / githubWorkflowBuildPreamble := Seq(WorkflowStep.Sbt(List("scalafmtCheckAll"))) ThisBuild / githubWorkflowPublish := Seq( WorkflowStep.Sbt( List("ci-release"), @@ -57,7 +57,7 @@ ThisBuild / shellPrompt := { state => // Additional meta-info -startYear := Some(2015) +startYear := Some(2015) organizationHomepage := Some(url("https://github.com/scaldi")) scmInfo := Some( ScmInfo(