Update sbt, scala and akka dependencies

.gitignore

@@ -11,6 +11,7 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+credentials.sbt
 
 # Scala-IDE specific
 .scala_dependencies
@@ -29,3 +30,4 @@ bin/
 .idea_modules
 projectFilesBackup
 
+/.bsp/sbt.json

.scalafmt.conf

@@ -0,0 +1,28 @@
+style = defaultWithAlign
+//@formatter on
+align                      {
+  tokens = [
+    {code = "=>", owner = "Case"}
+    {code = "extends", owner = "Defn.(Class|Trait|Object)"}
+    {code = "//", owner = ".*"}
+    {code = "{", owner = "Template"}
+    {code = "}", owner = "Template"}
+    {code = "%", owner = "Term.ApplyInfix"}
+    {code = "%%", owner = "Term.ApplyInfix"}
+    {code = "%%%", owner = "Term.ApplyInfix"}
+    {code = "=>", owner = "Case"}
+    {code = "<-", owner = "Enumerator.Generator"}
+    {code = "←", owner = "Enumerator.Generator"}
+    {code = "->", owner = "Term.ApplyInfix"}
+    {code = "→", owner = "Term.ApplyInfix"}
+    {code = "=", owner = "(Enumerator.Val|Defn.(Va(l|r)|Def|Type))"}
+  ]
+}
+danglingParentheses        = true
+docstrings                 = JavaDoc
+indentOperator             = spray
+maxColumn                  = 120
+rewrite.rules              = [RedundantBraces, RedundantParens, SortImports]
+unindentTopLevelOperators  = true
+project.git                = true
+newlines.alwaysBeforeTopLevelStatements = true

README.md

@@ -1,33 +1,14 @@
-[![Build Status](https://travis-ci.org/dlouwers/reactive-consul.svg?branch=master)](https://travis-ci.org/dlouwers/reactive-consul)
-[![Maven Central](https://img.shields.io/maven-central/v/nl.stormlantern/reactive-consul_2.11.svg)](https://maven-badges.herokuapp.com/maven-central/nl.stormlantern/reactive-consul)
+[![Maven Central](https://img.shields.io/maven-central/v/com.crobox.reactive-consul/client_2.13.svg)](https://maven-badges.herokuapp.com/maven-central/nl.stormlantern/reactive-consul)
 
 # Reactive Consul
 This project is a Consul client for Scala. It uses non-blocking I/O to communicate with a Consul cluster. You can use
 the ServiceBroker to get out of the box support for automatic-clustering, loadbalancing and failover or you can use
 the low-level ConsulHttpClient.
 
-
-## Releases
-
-### 0.3.0
-
-* Multiple _connectionStrategies_ are now allowed per named service so that they can be distinguished between by tags
-
-### 0.2.1
-
-* Fixed the POM having an unwanted dependencies
-
-### 0.2.0
-
-* Supports Scala 2.12
-* Uses akka-http instead of Spray, reducing the amount of dependencies (thanks [David Buschman](https://github.com/dbuschman7))
-* Uses native JDK 8 base64, reducing the amount of dependencies (thanks [David Buschman](https://github.com/dbuschman7))
-* Bootstrapping the library with SRV record is now an extra dependency (thanks [David Buschman](https://github.com/dbuschman7)) 
-
 ## Requirements
 
 * Java 8
-* Scala 2.11 or 2.12
+* Scala 2.13
 
 ## Adding it to your project
 Reactive Consul is available via [Maven Central](https://search.maven.org/), simply add it to your SBT build:

RELEASE.md

@@ -0,0 +1,61 @@
+from http://www.scala-sbt.org/release/docs/Using-Sonatype.html
+
+The credentials for your Sonatype OSSRH account need to be stored somewhere safe (e.g. NOT in the repository).
+Common convention is a ~/.sbt/1.0/sonatype.sbt or (~/.sbt/.credentials) file with the following:
+
+```
+credentials += Credentials("Sonatype Nexus Repository Manager",
+                           "oss.sonatype.org",
+                           "<your username>",
+                           "<your password>")
+```
+
+If not done already, generate a key and upload it to a keyserver.
+
+```
+$ gpg --gen-key
+$ gpg --list-secret-keys
+$ gpg --keyserver keyserver.ubuntu.com --send-keys 2BE.......E804D85663F
+```
+
+Release the client is done using the following three steps:
+
+```
+1. Release Code
+2. Publish Artifacts
+3. Releese Artifacts 
+```
+
+## Release Code
+
+To release and publish a version to oss.sonatype for both scala 2.12 and scala 2.13 run:
+
+```
+sbt release 
+```
+It's likely that *after* pushing all artifacts to the online repository you'll see an error complaining that the
+tag already exists. That's ok.
+
+## Publish Artifacts
+
+To only publish a certain version after f.e. the tags has been build, but your PGP was not correctly unlocked you can
+run
+
+```
+sbt publishSigned
+```
+
+If you want to publish only a single SCALA version, use `sbt ++2.11.12 publishSigned`
+
+## Release Artifacts
+
+To close and release the staging repository on Sonatype you can either go to the web interface or use
+
+```
+sbt sonatypeRelease
+```
+
+If something goes wrong and you want to cleanup/rollback, use `sbt sonatypeDropAll`
+
+You can verify if all has been published correctly by visiting the following url:<br>
+https://oss.sonatype.org/#nexus-search;quick~crobox

build.sbt

@@ -1,160 +1,75 @@
-import Dependencies._
-import sbt.Keys._
-import com.typesafe.sbt.SbtScalariform
-import com.typesafe.sbt.SbtScalariform.ScalariformKeys
+releaseCrossBuild := true
 
-import scalariform.formatter.preferences._
+sonatypeProfileName := "com.crobox"
 
-// Common variables
-lazy val commonSettings = Seq(
-  scalaVersion := "2.11.8",
-  crossScalaVersions := Seq("2.11.8", "2.12.2"),
-  organization := "nl.stormlantern",
-  version := "0.4.0-SNAPSHOT",
-  resolvers ++= Dependencies.resolutionRepos,
-  scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
-  )
-
-lazy val reactiveConsul = (project in file("."))
-  .settings( commonSettings: _* )
-  .settings( publishSettings: _* )
-  .aggregate(client, dnsHelper, dockerTestkit/*, example*/)
-
-
-lazy val dnsHelper = (project in file("dns-helper"))
-  .settings( commonSettings: _* )
-  .settings( publishSettings: _* )
-  .settings(
-    name := "reactive-consul-dns",
-    publishArtifact in Compile := true,
-    publishArtifact in makePom := true,
-    publishArtifact in Test := false,
-    publishArtifact in IntegrationTest := false,
-    fork := true,
-    libraryDependencies ++= Seq(
-      spotifyDns
-    ),
-    ScalariformKeys.preferences := ScalariformKeys.preferences.value
-      .setPreference(AlignSingleLineCaseStatements, true)
-      .setPreference(DoubleIndentClassDeclaration, true)
-      .setPreference(DanglingCloseParenthesis, Preserve)
-      .setPreference(RewriteArrowSymbols, true)
-  )
+ThisBuild / versionScheme := Some("early-semver")
 
-lazy val client = (project in file("client"))
-  .settings( commonSettings: _* )
-  .settings( publishSettings: _* )
+lazy val root = (project in file("."))
   .settings(
-    name := "reactive-consul",
-    publishArtifact in Compile := true,
-    publishArtifact in makePom := true,
-    publishArtifact in Test := false,
-    publishArtifact in IntegrationTest := false,
-    fork := true,
-    libraryDependencies ++= Seq(
-      akkaHttp,
-      sprayJson,
-      akkaActor,
-      slf4j,
-      akkaSlf4j,
-      scalaTest % "it,test",
-      scalaMock % "test",
-      logback % "it,test",
-      akkaTestKit % "it,test",
-      spotifyDocker % "it,test"
+    publish := {},
+    publishArtifact := false,
+    inThisBuild(
+      List(
+        organization := "com.crobox.reactive-consul",
+        scalaVersion := "2.13.15",
+        crossScalaVersions := List("2.13.15"),
+        javacOptions ++= Seq("-g", "-Xlint:unchecked", "-Xlint:deprecation", "-source", "11", "-target", "11"),
+        scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-language:_", "-encoding", "UTF-8"),
+        publishTo := {
+          val nexus = "https://oss.sonatype.org/"
+          if (version.value.trim.endsWith("SNAPSHOT"))
+            Some("snapshots" at nexus + "content/repositories/snapshots")
+          else
+            Some("releases" at nexus + "service/local/staging/deploy/maven2")
+        },
+        pomExtra := {
+          <url>https://github.com/crobox/reactive-consul</url>
+            <licenses>
+              <license>
+                <name>MIT</name>
+                <url>https://opensource.org/licenses/MIT</url>
+                <distribution>repo</distribution>
+              </license>
+            </licenses>
+            <scm>
+              <url>[email protected]:crobox/reactive-consul.git</url>
+              <connection>scm:[email protected]:crobox/reactive-consul.git</connection>
+            </scm>
+            <developers>
+              <developer>
+                <id>crobox</id>
+                <name>crobox</name>
+                <url>https://github.com/crobox</url>
+              </developer>
+              <developer>
+                <id>dlouwers</id>
+                <name>Dirk Louwers</name>
+                <url>http://github.com/dlouwers</url>
+              </developer>
+            </developers>
+        }
+      )
     ),
-    ScalariformKeys.preferences := ScalariformKeys.preferences.value
-      .setPreference(AlignSingleLineCaseStatements, true)
-      .setPreference(DoubleIndentClassDeclaration, true)
-      .setPreference(DanglingCloseParenthesis, Preserve)
-      .setPreference(RewriteArrowSymbols, true)
+    name := "reactive-consul"
   )
-  .configs( IntegrationTest )
-  .settings( Defaults.itSettings : _* )
-  .settings( SbtScalariform.scalariformSettingsWithIt : _* )
-  .dependsOn(dockerTestkit % "it-internal")
+  .aggregate(client)
 
-lazy val dockerTestkit = (project in file("docker-testkit"))
-  .settings( commonSettings: _* )
+lazy val client: Project = (project in file("client"))
+  .configs(Config.CustomIntegrationTest)
+  .settings(Config.testSettings: _*)
   .settings(
+    name := "client",
+    sbtrelease.ReleasePlugin.autoImport.releasePublishArtifactsAction := PgpKeys.publishSigned.value,
     libraryDependencies ++= Seq(
-      slf4j,
-      scalaTest,
-      spotifyDocker
+      "ch.qos.logback"   % "logback-classic" % "1.4.7",
+      "io.spray"         %% "spray-json"     % "1.3.6",
+      "org.apache.pekko" %% "pekko-actor"    % Dependencies.PekkoVersion,
+      "org.apache.pekko" %% "pekko-slf4j"    % Dependencies.PekkoVersion,
+      "org.apache.pekko" %% "pekko-stream"   % Dependencies.PekkoVersion,
+      "org.apache.pekko" %% "pekko-http"     % Dependencies.PekkoHttpVersion,
+      // test dependencies
+      "org.apache.pekko" %% "pekko-testkit" % Dependencies.PekkoVersion % Test,
+      "org.scalatest"    %% "scalatest"     % "3.2.15"                  % Test,
+      "org.scalamock"    %% "scalamock"     % "5.2.0"                   % Test
     )
   )
-  .configs( IntegrationTest )
-  .settings( Defaults.itSettings : _* )
-  .settings( SbtScalariform.scalariformSettingsWithIt : _* )
-  .settings( publishSettings: _* )
-
-
-//lazy val example = (project in file("example"))
-//  .aggregate(client)
-//  .dependsOn(client, dnsHelper)
-//  .settings( commonSettings: _* )
-//  .settings(
-//    crossScalaVersions := Seq()
-//  )
-//  .settings(
-//      libraryDependencies ++= Seq(
-//        sprayClient,
-//        sprayRouting,
-//        sprayJson,
-//        slf4j,
-//        logback
-//      )
-//  )
-//  .settings(
-//    fork := true,
-//    libraryDependencies ++= Seq(
-//      akkaActor,
-//      sprayClient,
-//      sprayJson
-//    )
-//  )
-//  .settings( publishSettings: _* )
-//  .enablePlugins(JavaAppPackaging)
-//  .settings(
-//    packageName in Docker := "reactive-consul-example",
-//    maintainer in Docker := "Dirk Louwers <[email protected]>",
-//    dockerExposedPorts in Docker := Seq(8080),
-//    dockerExposedVolumes in Docker := Seq("/opt/docker/logs")
-//  )
-
-lazy val publishSettings = Seq(
-  publishArtifact := false,
-  publishMavenStyle := true,
-  pomIncludeRepository := { _ => false },
-  credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"),
-  publishTo := {
-    val nexus = "https://oss.sonatype.org/"
-    if (isSnapshot.value)
-      Some("snapshots" at nexus + "content/repositories/snapshots")
-    else
-      Some("releases" at nexus + "service/local/staging/deploy/maven2")
-  },
-  pomExtra := (
-    <url>http://github.com/dlouwers/reactive-consul</url>
-      <licenses>
-        <license>
-          <name>MIT</name>
-          <url>https://opensource.org/licenses/MIT</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-      <scm>
-        <url>[email protected]:dlouwers/reactive-consul.git</url>
-        <connection>scm:[email protected]:dlouwers/reactive-consul.git</connection>
-      </scm>
-      <developers>
-        <developer>
-          <id>dlouwers</id>
-          <name>Dirk Louwers</name>
-          <url>http://github.com/dlouwers</url>
-        </developer>
-      </developers>
-    )
-)
-
-Revolver.settings.settings

client/src/it/resources/application.conf

@@ -1,6 +1,6 @@
-akka {
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
+pekko {
+  loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
-  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+  logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
   log-dead-letters-during-shutdown = off
 }