Skip to content

Commit

Permalink
fix publish
Browse files Browse the repository at this point in the history
  • Loading branch information
jxnu-liguobin committed Mar 25, 2022
1 parent a91009e commit 7b84f3a
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.4.1-SNAPSHOT"
version in ThisBuild := "0.4.0"
51 changes: 25 additions & 26 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion project/Publishing.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down

0 comments on commit 7b84f3a

Please sign in to comment.