Skip to content

Commit

Permalink
Merge pull request #57 from scala-steward/update/scalafmt-core-3.0.0-RC6
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.0.0-RC6
  • Loading branch information
dave-handy committed Jul 27, 2021
2 parents ead4fd5 + 2d744f5 commit b76953e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.0.0-RC5
version = 3.0.0-RC6

project.git = true
maxColumn = 120
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"),
Expand All @@ -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(
Expand Down

0 comments on commit b76953e

Please sign in to comment.