Merge pull request #144 from mdsol/add-publish-to-core

add publish settings to auth core
mdsol · Aug 16, 2022 · d159f89 · d159f89
2 parents a261dea + 86ee980
commit d159f89
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 22 deletions.
diff --git a/build.sbt b/build.sbt
@@ -77,13 +77,11 @@ lazy val `mauth-signer-apachehttp` = javaModuleProject("mauth-signer-apachehttp"
 lazy val `mauth-signer-scala-core` = scalaModuleProject("mauth-signer-scala-core")
   .dependsOn(`mauth-signer`, `mauth-test-utils` % "test")
   .settings(
-    noPublishSettings,
+    publishSettings,
     moduleName := "mauth-signer-scala-core",
-    testFrameworks += new TestFramework("munit.Framework"),
     libraryDependencies ++=
       Dependencies.compile(akkaHttp, akkaStream).map(withExclusions) ++
         Dependencies.compile(scalaLogging, scalaLibCompat).map(withExclusions) ++
-        //Dependencies.example(akkaHttp, akkaStream).map(withExclusions) ++
         Dependencies.test(scalaMock, scalaTest, wiremock).map(withExclusions),
     mimaPreviousArtifacts := Set.empty
   )
@@ -98,7 +96,8 @@ lazy val `mauth-signer-akka-http` = scalaModuleProject("mauth-signer-akka-http")
       Dependencies.provided(akkaHttp, akkaStream).map(withExclusions) ++
         Dependencies.compile(scalaLogging, scalaLibCompat).map(withExclusions) ++
         Dependencies.example(akkaHttp, akkaStream).map(withExclusions) ++
-        Dependencies.test(scalaMock, scalaTest, wiremock).map(withExclusions)
+        Dependencies.test(scalaMock, scalaTest, wiremock).map(withExclusions),
+    mimaPreviousArtifacts := Set.empty
   )
 
 lazy val `mauth-signer-sttp` = scalaModuleProject("mauth-signer-sttp")
@@ -107,7 +106,8 @@ lazy val `mauth-signer-sttp` = scalaModuleProject("mauth-signer-sttp")
     publishSettings,
     libraryDependencies ++=
       Dependencies.compile(scalaLibCompat, sttp, scalaLogging).map(withExclusions) ++
-        Dependencies.test(scalaMock, scalaTest, wiremock, sttpAkkaHttpBackend).map(withExclusions)
+        Dependencies.test(scalaMock, scalaTest, wiremock, sttpAkkaHttpBackend).map(withExclusions),
+    mimaPreviousArtifacts := Set.empty
   )
 
 lazy val `mauth-signer-http4s` = scalaModuleProject("mauth-signer-http4s")
@@ -134,7 +134,8 @@ lazy val `mauth-sender-sttp-akka-http` = scalaModuleProject("mauth-sender-sttp-a
     publishSettings,
     libraryDependencies ++=
       Dependencies.compile(catsEffect, akkaHttp, akkaStream, scalaLibCompat, sttp, scalaLogging).map(withExclusions) ++
-        Dependencies.test(scalaMock, scalaTest, wiremock, sttpAkkaHttpBackend).map(withExclusions)
+        Dependencies.test(scalaMock, scalaTest, wiremock, sttpAkkaHttpBackend).map(withExclusions),
+    mimaPreviousArtifacts := Set.empty
   )
 
 lazy val `mauth-authenticator` = javaModuleProject("mauth-authenticator")
@@ -149,7 +150,8 @@ lazy val `mauth-authenticator-scala` = scalaModuleProject("mauth-authenticator-s
     publishSettings,
     libraryDependencies ++=
       Dependencies.test(logbackClassic, scalaMock, scalaTest, scalaLibCompat).map(withExclusions) ++
-        Dependencies.compile(catsEffect).map(withExclusions)
+        Dependencies.compile(catsEffect).map(withExclusions),
+    mimaPreviousArtifacts := Set.empty
   )
 
 lazy val `mauth-authenticator-apachehttp` = javaModuleProject("mauth-authenticator-apachehttp")
@@ -158,7 +160,8 @@ lazy val `mauth-authenticator-apachehttp` = javaModuleProject("mauth-authenticat
     publishSettings,
     libraryDependencies ++=
       Dependencies.compile(jacksonDataBind, guava, slf4jApi).map(withExclusions) ++
-        Dependencies.test(scalaMock, scalaTest, wiremock).map(withExclusions)
+        Dependencies.test(scalaMock, scalaTest, wiremock).map(withExclusions),
+    mimaPreviousArtifacts := Set.empty
   )
 
 lazy val `mauth-authenticator-akka-http` = scalaModuleProject("mauth-authenticator-akka-http")
@@ -168,7 +171,8 @@ lazy val `mauth-authenticator-akka-http` = scalaModuleProject("mauth-authenticat
     libraryDependencies ++=
       Dependencies.provided(akkaHttp, akkaStream) ++
         Dependencies.compile(jacksonDataBind, scalaCache).map(withExclusions) ++
-        Dependencies.test(scalaTest, scalaMock, wiremock) ++ Dependencies.test(akkaHttpTestKit: _*).map(withExclusions)
+        Dependencies.test(scalaTest, scalaMock, wiremock) ++ Dependencies.test(akkaHttpTestKit: _*).map(withExclusions),
+    mimaPreviousArtifacts := Set.empty
   )
 
 lazy val `mauth-authenticator-http4s` = (project in file("modules/mauth-authenticator-http4s")) // don't need to cross-compile

diff --git a/modules/mauth-signer-scala-core/src/test/scala/com/mdsol/mauth/MAuthRequestSignerSpec.scala b/modules/mauth-signer-scala-core/src/test/scala/com/mdsol/mauth/MAuthRequestSignerSpec.scala
@@ -4,26 +4,13 @@ import java.net.URI
 import java.security.Security
 import java.util.UUID
 
-import akka.actor.ActorSystem
-import akka.http.scaladsl.model._
-import com.github.tomakehurst.wiremock.WireMockServer
-import com.github.tomakehurst.wiremock.client.WireMock.{aResponse, equalTo, post, urlPathEqualTo}
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig
-import com.mdsol.mauth.http.HttpClient
-import com.mdsol.mauth.http.Implicits._
 import com.mdsol.mauth.models.{UnsignedRequest => NewUnsignedRequest}
 import com.mdsol.mauth.test.utils.TestFixtures._
 import com.mdsol.mauth.util.EpochTimeProvider
-import org.apache.http.HttpStatus
 import org.bouncycastle.jce.provider.BouncyCastleProvider
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.concurrent.PatienceConfiguration.Timeout
-import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 
-import scala.concurrent.duration._
-
 class MAuthRequestSignerSpec extends AnyFlatSpec with Matchers {
 
   Security.addProvider(new BouncyCastleProvider)