Remove release early (#36)

zio-archive · Sep 21, 2019 · cd1ba25 · cd1ba25
1 parent 267daee
commit cd1ba25
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -87,10 +87,8 @@ jobs:
           key: sbt-cache
       - run: echo -n "${PGP_PUBLIC}" | base64 -d > /tmp/public.asc
       - run: echo -n "${PGP_SECRET}" | base64 -d > /tmp/secret.asc
-      - run: sbt ++2.11.12! interopMonixJVM/releaseEarly
-      - run: sbt ++2.12.8! interopMonixJVM/releaseEarly
-      - run: sbt ++2.11.12! interopMonixJS/releaseEarly
-      - run: sbt ++2.12.8! interopMonixJS/releaseEarly
+      - run: ./sbt ++2.11.12! +clean +sonatypeBundleClean +publishSigned +sonatypeBundleRelease
+      - run: ./sbt ++2.12.8! +clean +sonatypeBundleClean +publishSigned +sonatypeBundleRelease
 
 workflows:
   version: 2

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 import explicitdeps.ExplicitDepsPlugin.autoImport.moduleFilterRemoveValue
-import ScalazBuild._
+import BuildHelper._
 
 inThisBuild(
   List(
@@ -17,13 +17,14 @@ inThisBuild(
     ),
     pgpPublicRing := file("/tmp/public.asc"),
     pgpSecretRing := file("/tmp/secret.asc"),
-    releaseEarlyWith := SonatypePublisher,
     scmInfo := Some(
       ScmInfo(url("https://github.com/zio/interop-monix/"), "scm:git:git@github.com:zio/interop-monix.git")
     )
   )
 )
 
+publishTo in ThisBuild := sonatypePublishToBundle.value
+
 addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
 addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
 addCommandAlias("testJVM", ";interopMonixJVM/test")

diff --git a/project/ScalazBuild.scala → project/BuildHelper.scala b/project/ScalazBuild.scala → project/BuildHelper.scala
@@ -6,7 +6,7 @@ import sbtcrossproject.CrossPlugin.autoImport.CrossType
 import sbtbuildinfo._
 import BuildInfoKeys._
 
-object ScalazBuild {
+object BuildHelper {
   val testDeps        = Seq("org.scalacheck"  %% "scalacheck"   % "1.14.1" % "test")
   val compileOnlyDeps = Seq("com.github.ghik" %% "silencer-lib" % "1.4.2"  % "provided")
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,7 +3,9 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"  % "0.6.1")
 addSbtPlugin("org.scalameta"      % "sbt-scalafmt"              % "2.0.5")
 addSbtPlugin("com.eed3si9n"       % "sbt-buildinfo"             % "0.9.0")
 addSbtPlugin("org.scoverage"      % "sbt-scoverage"             % "1.6.0")
-addSbtPlugin("ch.epfl.scala"      % "sbt-release-early"         % "2.1.1")
 addSbtPlugin("com.github.cb372"   % "sbt-explicit-dependencies" % "0.2.10")
 addSbtPlugin("de.heikoseeberger"  % "sbt-header"                % "5.2.0")
 addSbtPlugin("ch.epfl.scala"      % "sbt-bloop"                 % "1.3.2")
+addSbtPlugin("com.dwijnand"       % "sbt-dynver"                % "4.0.0")
+addSbtPlugin("com.jsuereth"       % "sbt-pgp"                   % "2.0.0")
+addSbtPlugin("org.xerial.sbt"     % "sbt-sonatype"              % "3.7")