diff --git a/Version.sbt b/Version.sbt index 5492cbd58ca64c2ee6e76f7feb2f3fd438a47613..9f0e5a53533444b83d2e939fa3c8aad80acbc5bb 100644 --- a/Version.sbt +++ b/Version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.4.1-SNAPSHOT" +version in ThisBuild := "0.4.0" diff --git a/build.sbt b/build.sbt index ef559da2d287b124de5fc7510940101e69a22f5c..fd91e1fd93e2a32ccb12f4e40435c5d924eacb54 100644 --- a/build.sbt +++ b/build.sbt @@ -17,6 +17,8 @@ lazy val lastVersionForExamples = "0.4.0-SNAPSHOT" lazy val commonSettings = Seq( organization := "org.bitlap", + organizationName := "bitlap", + startYear := Some(2022), scalaVersion := scala213, libraryDependencies ++= Seq( "org.scala-lang" % "scala-compiler" % scalaVersion.value, @@ -30,33 +32,12 @@ lazy val commonSettings = } ++ Seq("-language:experimental.macros"), Compile / compile := (Compile / compile).dependsOn(Compile / headerCreateAll).value, Global / onChangedBuildSource := ReloadOnSourceChanges, - organizationName := "bitlap", - startYear := Some(2022), headerLicense := Some(HeaderLicense.MIT("2022", "bitlap")), - licenses += License.MIT, Test / testOptions += Tests.Argument("-oDF"), Test / fork := true, - releaseIgnoreUntrackedFiles := true, - releaseCrossBuild := true, - releaseTagName := { - (ThisBuild / version).value - }, - releasePublishArtifactsAction := PgpKeys.publishSigned.value, - releaseProcess := Seq[ReleaseStep]( - checkSnapshotDependencies, - inquireVersions, - runClean, - releaseStepCommandAndRemaining("+compile"), - releaseStepCommandAndRemaining("test"), - setReleaseVersion, - commitReleaseVersion, - tagRelease, - releaseStepCommandAndRemaining("+publishSigned"), - releaseStepCommand("sonatypeBundleRelease"), - setNextVersion, - commitNextVersion, - pushChanges - )) + publishConfiguration := publishConfiguration.value.withOverwrite(true), + publishLocalConfiguration := publishLocalConfiguration.value.withOverwrite(true) + ) lazy val `cacheable-core` = (project in file("cacheable-core")) .settings(commonSettings).settings(Publishing.publishSettings) @@ -148,9 +129,27 @@ lazy val tools = (project in file("tools")) lazy val root = (project in file(".")).aggregate(tools, `cacheable-core`, `cacheable-redis`, `cacheable-caffeine`, `cacheable-benchmark`) .settings( - publishArtifact := false, + crossScalaVersions := Nil, publish / skip := true, - headerLicense := Some(HeaderLicense.MIT("2022", "bitlap")) + headerLicense := Some(HeaderLicense.MIT("2022", "bitlap")), + releaseIgnoreUntrackedFiles := true, + releaseCrossBuild := false, //@see https://www.scala-sbt.org/1.x/docs/Cross-Build.html + releaseTagName := (ThisBuild / version).value, + releasePublishArtifactsAction := PgpKeys.publishSigned.value, + releaseProcess := Seq[ReleaseStep]( + checkSnapshotDependencies, + inquireVersions, + runClean, + releaseStepCommandAndRemaining("+compile"), + releaseStepCommandAndRemaining("test"), + setReleaseVersion, + commitReleaseVersion, + tagRelease, + releaseStepCommandAndRemaining("+publishSigned"), + setNextVersion, + commitNextVersion, + pushChanges + ) ) lazy val `scala2-13` = (project in file("examples/scala2-13")).settings(scalaVersion := scala213) diff --git a/project/Publishing.scala b/project/Publishing.scala index d5124c33cd52d990caffb3c8e9e81eeeeeb42ef4..3abbff45145e11cd95195ebb32f84be971e1277d 100644 --- a/project/Publishing.scala +++ b/project/Publishing.scala @@ -22,7 +22,7 @@ object Publishing { else Some("releases" at nexus + "service/local/staging/deploy/maven2") }, - licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")), + licenses := Seq(License.MIT), publishMavenStyle := true, Test / publishArtifact := false, pomIncludeRepository := { _ => false },