diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96c2ab2..714adef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.2.1] + scala: [3.2.2] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 72e0d35..d31cd14 100644 --- a/build.sbt +++ b/build.sbt @@ -7,25 +7,25 @@ val username = "RustedBones" val repo = "scout" // for sbt-github-actions -ThisBuild / scalaVersion := "3.2.1" +ThisBuild / scalaVersion := "3.2.2" ThisBuild / githubWorkflowBuild := Seq( WorkflowStep.Sbt(name = Some("Check project"), commands = List("scalafmtCheckAll", "headerCheckAll")), WorkflowStep.Sbt(name = Some("Build project"), commands = List("test", "IntegrationTest/test")) ) -ThisBuild / githubWorkflowTargetBranches := Seq("main") +ThisBuild / githubWorkflowTargetBranches := Seq("main") ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty lazy val commonSettings = Defaults.itSettings ++ headerSettings(Configurations.IntegrationTest) ++ inConfig(IntegrationTest)(ScalafmtPlugin.scalafmtConfigSettings) ++ Seq( - organization := "fr.davit", + organization := "fr.davit", organizationName := "Michel Davit", - scalaVersion := (ThisBuild / scalaVersion).value, - homepage := Some(url(s"https://github.com/$username/$repo")), + scalaVersion := (ThisBuild / scalaVersion).value, + homepage := Some(url(s"https://github.com/$username/$repo")), licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")), startYear := Some(2020), - scmInfo := Some(ScmInfo(url(s"https://github.com/$username/$repo"), s"git@github.com:$username/$repo.git")), + scmInfo := Some(ScmInfo(url(s"https://github.com/$username/$repo"), s"git@github.com:$username/$repo.git")), developers := List( Developer( id = s"$username", @@ -34,27 +34,25 @@ lazy val commonSettings = Defaults.itSettings ++ url = url(s"https://github.com/$username") ) ), - publishMavenStyle := true, + publishMavenStyle := true, Test / publishArtifact := false, publishTo := { - val resolver = if (isSnapshot.value) { - Opts.resolver.sonatypeSnapshots: @nowarn("cat=deprecation") - } else { - Opts.resolver.sonatypeStaging - } + val resolver = + if isSnapshot.value then Opts.resolver.sonatypeSnapshots: @nowarn("cat=deprecation") + else Opts.resolver.sonatypeStaging Some(resolver) }, releasePublishArtifactsAction := PgpKeys.publishSigned.value, - credentials ++= (for { + credentials ++= (for username <- sys.env.get("SONATYPE_USERNAME") password <- sys.env.get("SONATYPE_PASSWORD") - } yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq, + yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq, testFrameworks += new TestFramework("munit.Framework") ) lazy val `scout` = (project in file(".")) .configs(IntegrationTest) - .settings(commonSettings: _*) + .settings(commonSettings*) .settings( libraryDependencies ++= Seq( Dependencies.Taxonomy,