Merge pull request #507 from iheartradio/fix-ci-release

fixing ci release

.github/workflows/scala.yml

@@ -32,4 +32,4 @@ jobs:
         sbt ';project playSwagger;clean;+test'
     - name: Example compile
       run: 
-        cd example && sbt clean scalafmtSbtCheck scalafmtCheckAll scalafixEnable "scalafixAll --check" compile
+        sbt publishForExample && cd example && sbt clean scalafmtSbtCheck scalafmtCheckAll scalafixEnable "scalafixAll --check" compile

build.sbt

@@ -1,12 +1,17 @@
 organization in ThisBuild := "com.iheart"
 
-scalafixDependencies in ThisBuild ++= Seq(
+ThisBuild / scalafixDependencies ++= Seq(
   "com.github.liancheng" %% "organize-imports" % "0.6.0",
   "net.pixiv" %% "scalafix-pixiv-rule" % "2.4.0"
 )
 
+addCommandAlias(
+  "publishForExample",
+  ";set ThisBuild / version := \"0.0.1-EXAMPLE\"; +publishLocal"
+)
+
 lazy val noPublishSettings = Seq(
-  skip in publish := true,
+  publish / skip := true,
   publish := (),
   publishLocal := (),
   publishArtifact := false

example/project/plugins.sbt

@@ -6,4 +6,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.1")
 
 // play swagger plugin
-addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.13.1-SNAPSHOT")
+addSbtPlugin("com.iheart" % "sbt-play-swagger" % "0.0.1-EXAMPLE")

project/Publish.scala

@@ -1,13 +1,11 @@
 import com.jsuereth.sbtpgp.PgpKeys
 import xerial.sbt.Sonatype.autoImport._
 import sbt._, Keys._
-import sbtrelease.ReleasePlugin.autoImport._
-import ReleaseTransformations._
 
 object Publish {
 
   val coreSettings = Seq(
-    organization in ThisBuild := "com.iheart",
+    ThisBuild / organization := "com.iheart",
     publishMavenStyle := true,
     licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
     homepage := Some(url("http://iheartradio.github.io/play-swagger")),
@@ -24,24 +22,8 @@ object Publish {
       )
     ),
     pomIncludeRepository := { _ ⇒ false },
-    publishArtifact in Test := false,
-    releaseCrossBuild := true,
-    publishTo := sonatypePublishToBundle.value,
-    releasePublishArtifactsAction := PgpKeys.publishSigned.value,
-    releaseProcess := Seq[ReleaseStep](
-      checkSnapshotDependencies,
-      inquireVersions,
-      releaseStepCommandAndRemaining("+clean"),
-      releaseStepCommandAndRemaining("+test"),
-      setReleaseVersion,
-      commitReleaseVersion,
-      tagRelease,
-      releaseStepCommandAndRemaining("+publishSigned"),
-      releaseStepCommand("sonatypeBundleRelease"),
-      setNextVersion,
-      commitNextVersion,
-      pushChanges
-    )
+    Test / publishArtifact := false,
+    publishTo := sonatypePublishToBundle.value
   )
 
 }

project/plugins.sbt

@@ -11,5 +11,3 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.1")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
-
-addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")