[sonatype] unify sonatype plugin code-style with rest of cbt

- indent parameter lists like other cbt code
- avoid stripMargin for style reasons

also add logger, eventhough not used right now

4 files changed, 44 insertions, 42 deletions

diff --git a/plugins/sonatype-release/src/SonatypeRelease.scala b/plugins/sonatype-release/src/SonatypeRelease.scala
index cc2932a..6a21939 100644
--- a/plugins/sonatype-release/src/SonatypeRelease.scala
+++ b/plugins/sonatype-release/src/SonatypeRelease.scala
@@ -27,7 +27,7 @@ trait SonatypeRelease extends Publish {
 
   def sonatypeCredentials: String = SonatypeLib.sonatypeCredentials
 
-  def sonatypePublishSigned: ExitCode =
+  def sonatypePublishSigned: ExitCode = {
     sonatypeLib.sonatypePublishSigned(
       sourceFiles,
       `package` :+ pom,
@@ -37,6 +37,7 @@ trait SonatypeRelease extends Publish {
       isSnapshot,
       scalaMajorVersion
     )
+  }
 
   def sonatypePublishSignedSnapshot: ExitCode = {
     copy(context.copy(version = Some(version + "-SNAPSHOT"))).sonatypePublishSigned
@@ -46,5 +47,5 @@ trait SonatypeRelease extends Publish {
     sonatypeLib.sonatypeRelease(groupId, artifactId, version)
 
   private def sonatypeLib =
-    new SonatypeLib(sonatypeServiceURI, sonatypeSnapshotsURI, sonatypeCredentials, profileName)(lib)
+    new SonatypeLib(sonatypeServiceURI, sonatypeSnapshotsURI, sonatypeCredentials, profileName)(lib, logger.log("sonatype-release",_))
 }
diff --git a/plugins/sonatype-release/src/sonatype/SonatypeHttpApi.scala b/plugins/sonatype-release/src/sonatype/SonatypeHttpApi.scala
index e90b81d..6c6f4e8 100644
--- a/plugins/sonatype-release/src/sonatype/SonatypeHttpApi.scala
+++ b/plugins/sonatype-release/src/sonatype/SonatypeHttpApi.scala
@@ -185,24 +185,24 @@ private final class SonatypeHttpApi(sonatypeURI: String, sonatypeCredentials: St
 
   private def promoteRequestBody(repoId: String, description: String, targetRepoId: String) =
     s"""
-       |<promoteRequest>
-       |  <data>
-       |    <stagedRepositoryId>$repoId</stagedRepositoryId>
-       |    <description>$description</description>
-       |    <targetRepositoryId>$targetRepoId</targetRepositoryId>
-       |  </data>
-       |</promoteRequest>
-    """.stripMargin
+      <promoteRequest>
+        <data>
+          <stagedRepositoryId>$repoId</stagedRepositoryId>
+          <description>$description</description>
+          <targetRepositoryId>$targetRepoId</targetRepositoryId>
+        </data>
+      </promoteRequest>
+    """
 
 
   private def createRequestBody(description: String) =
     s"""
-       |<promoteRequest>
-       |  <data>
-       |    <description>$description</description>
-       |  </data>
-       |</promoteRequest>
-    """.stripMargin
+      <promoteRequest>
+        <data>
+          <description>$description</description>
+        </data>
+      </promoteRequest>
+    """
 
   private def extractStagingRepository(repo: xml.Node): StagingRepository =
     StagingRepository(
diff --git a/plugins/sonatype-release/src/sonatype/SonatypeLib.scala b/plugins/sonatype-release/src/sonatype/SonatypeLib.scala
index 9aab9f5..4666950 100644
--- a/plugins/sonatype-release/src/sonatype/SonatypeLib.scala
+++ b/plugins/sonatype-release/src/sonatype/SonatypeLib.scala
@@ -52,10 +52,11 @@ object SonatypeLib {
 }
 
 final class SonatypeLib(
-                         sonatypeServiceURI: String,
-                         sonatypeSnapshotsURI: String,
-                         sonatypeCredentials: String,
-                         profileName: String)(lib: Lib) {
+  sonatypeServiceURI: String,
+  sonatypeSnapshotsURI: String,
+  sonatypeCredentials: String,
+  profileName: String
+)( lib: Lib, log: String => Unit ) {
 
   private val sonatypeApi = new SonatypeHttpApi(sonatypeServiceURI, sonatypeCredentials, profileName)(sonatypeLogger)
 
@@ -66,14 +67,14 @@ final class SonatypeLib(
    * • publish jars to created repo
   */
   def sonatypePublishSigned(
-                             sourceFiles: Seq[File],
-                             artifacts: Seq[File],
-                             groupId: String,
-                             artifactId: String,
-                             version: String,
-                             isSnapshot: Boolean,
-                             scalaMajorVersion: String
-                                 ): ExitCode = {
+    sourceFiles: Seq[File],
+    artifacts: Seq[File],
+    groupId: String,
+    artifactId: String,
+    version: String,
+    isSnapshot: Boolean,
+    scalaMajorVersion: String
+  ): ExitCode = {
     if(sourceFiles.nonEmpty) {
       System.err.println(lib.blue("Staring publishing to Sonatype."))
 
@@ -107,10 +108,10 @@ final class SonatypeLib(
     * • drop this repo.
     */
   def sonatypeRelease(
-                     groupId: String,
-                     artifactId: String,
-                     version: String
-                     ): ExitCode = {
+    groupId: String,
+    artifactId: String,
+    version: String
+  ): ExitCode = {
     val profile = getStagingProfile()
 
     sonatypeApi.getStagingRepos(profile).toList match {
diff --git a/plugins/sonatype-release/src/sonatype/models.scala b/plugins/sonatype-release/src/sonatype/models.scala
index 4446c53..88ec3b5 100644
--- a/plugins/sonatype-release/src/sonatype/models.scala
+++ b/plugins/sonatype-release/src/sonatype/models.scala
@@ -1,11 +1,11 @@
 package cbt.sonatype
 
 case class StagingProfile(
-                           id: String,
-                           name: String,
-                           repositoryTargetId: String,
-                           resourceURI: String
-                         )
+  id: String,
+  name: String,
+  repositoryTargetId: String,
+  resourceURI: String
+)
 
 case class StagingRepositoryId(repositoryId: String)
 
@@ -24,8 +24,8 @@ case object Released extends RepositoryState
 case class Unknown(state: String) extends RepositoryState
 
 case class StagingRepository(
-                              profileId: String,
-                              profileName: String,
-                              repositoryId: String,
-                              state: RepositoryState // stands as `type` in XML response
-                            )
+  profileId: String,
+  profileName: String,
+  repositoryId: String,
+  state: RepositoryState // stands as `type` in XML response
+)