improve sonatype plugin

- reduce required tasks in favor of using SonatypeLib.copy
- improve log messages
- automatically release non-snapshots after uploading

1 files changed, 4 insertions, 25 deletions

diff --git a/plugins/sonatype-release/src/SonatypeRelease.scala b/plugins/sonatype-release/src/SonatypeRelease.scala
index e53a5a1..5d908f9 100644
--- a/plugins/sonatype-release/src/SonatypeRelease.scala
+++ b/plugins/sonatype-release/src/SonatypeRelease.scala
@@ -17,31 +17,10 @@ import cbt.sonatype.SonatypeLib
   *     - promotes staging repository to Central repository;
   *     - drops staging repository after release.
   */
-trait SonatypeRelease extends Publish {
+trait SonatypeRelease extends Publish{
+  protected def sonatypeLib = SonatypeLib(groupId)
 
-  def profileName: String = groupId
+  def publishSonatype = sonatypeLib.publishSigned( publishedArtifacts, releaseFolder )
 
-  def sonatypeServiceURI: String = SonatypeLib.sonatypeServiceURI
-
-  def sonatypeSnapshotsURI: String = SonatypeLib.sonatypeSnapshotsURI
-
-  def sonatypeCredentials: String = SonatypeLib.sonatypeCredentials
-
-  def sonatypePublishSigned: ExitCode = {
-    sonatypeLib.sonatypePublishSigned(
-      sourceFiles,
-      `package` :+ pom,
-      groupId,
-      artifactId,
-      version,
-      isSnapshot,
-      scalaMajorVersion
-    )
-  }
-
-  def sonatypeRelease: ExitCode =
-    sonatypeLib.sonatypeRelease(groupId, artifactId, version)
-
-  private def sonatypeLib =
-    new SonatypeLib(sonatypeServiceURI, sonatypeSnapshotsURI, sonatypeCredentials, profileName)(lib, logger.log("sonatype-release",_))
+  override def publish = {super.publish; publishSonatype}
 }