From 1c07512716d98e4424760e88f7f3378fc5708b04 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sun, 3 Dec 2017 14:44:33 -0800
Subject: Fix publishing

---
 .ci/build    | 13 +++++++++++--
 CHANGELOG.md |  2 +-
 build.sbt    | 10 ++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.ci/build b/.ci/build
index 10edc63..f579187 100755
--- a/.ci/build
+++ b/.ci/build
@@ -23,7 +23,7 @@ EOF
 
     # Setup publishing
     cat <<EOF > sonatype.sbt
-    credentials += Credentials(
+    credentials in Global += Credentials(
         "Sonatype Nexus Repository Manager",
         "oss.sonatype.org",
         "8VNUX6+2",
@@ -34,5 +34,14 @@ EOF
     # Build and publish
     sbt clean
     sbt -Drelease=true +test
-    sbt -Drelease=true +publishSigned sonatypeRelease
+
+    # Separate publish steps are required as the "native" project does
+    # not cross-compile and sbt complains if a published file is
+    # overwritten
+    sbt -Drelease=true \
+	native/publishSigned \
+	+sync/publishSigned \
+	+core/publishSigned \
+	+stream/publishSigned \
+	sonatypeRelease
 fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6087eaf..f4c012b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# UNRELEASED
+# Version 4.1.2
 - Upgrade Akka to 2.5.7
 - Build: upgrade sbt to 1.0.4 and related plugins
 
diff --git a/build.sbt b/build.sbt
index d04e880..f6bdd78 100644
--- a/build.sbt
+++ b/build.sbt
@@ -20,10 +20,12 @@ organization in ThisBuild := "ch.jodersky"
 licenses in ThisBuild := Seq(("BSD New", url("http://opensource.org/licenses/BSD-3-Clause")))
 homepage in ThisBuild := Some(url("https://jodersky.github.io/akka-serial"))
 publishMavenStyle in ThisBuild := true
-publishTo in ThisBuild := {
-  val nexus = "https://oss.sonatype.org/"
-  Some("releases" at nexus + "service/local/staging/deploy/maven2")
-}
+publishTo in ThisBuild := Some(
+  if (isSnapshot.value)
+    Opts.resolver.sonatypeSnapshots
+  else
+    Opts.resolver.sonatypeStaging
+)
 pomExtra in ThisBuild := {
   <scm>
     <url>git@github.com:jodersky/akka-serial.git</url>
-- 
cgit v1.2.3