Use new nexus

Bijan Chokoufe Nejad · Bijan Chokoufe Nejad · commit f34cde4a7e52 · 2020-04-29T09:17:44.000Z
diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,7 @@ lazy val commonScalaSettings = Seq(
 
 lazy val scalaMacros: Seq[Def.Setting[_]] = Seq(
   libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, 12)) => Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full))
+    case Some((2, 12)) => Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full))
     case _             => Seq()
   }),
   scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/MainSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/MainSpec.scala
@@ -1,9 +1,10 @@
 package com.enfore.apis
 
 import com.enfore.apis.generator.{GenericImplementation, Http4sImplementation}
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
 
-class MainSpec extends FlatSpec with Matchers {
+class MainSpec extends AnyFlatSpec with should.Matchers {
 
   it should "be able to generate scala for all yamls" in {
     val sources = List("catalog", "Contacts-API", "ERP-API", "problem", "purchasing", "registry").map(_ + ".json")
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/ast/ASTTranslationFunctionsTest.scala b/openapi-scala/src/test/scala/com/enfore/apis/ast/ASTTranslationFunctionsTest.scala
@@ -1,19 +1,10 @@
 package com.enfore.apis.ast
 
 import com.enfore.apis.ast.ASTTranslationFunctions.PackageName
-import com.enfore.apis.ast.SwaggerAST.{
-  OperationObject,
-  ParameterLocation,
-  ParameterObject,
-  ReferenceObject,
-  RequestType,
-  SchemaObject,
-  SchemaObjectType,
-  SchemaOrReferenceObject
-}
-import org.scalatest.FunSuite
+import com.enfore.apis.ast.SwaggerAST._
+import org.scalatest.funsuite.AnyFunSuite
 
-class ASTTranslationFunctionsTest extends FunSuite {
+class ASTTranslationFunctionsTest extends AnyFunSuite {
 
   val readOnlyString: SchemaObject = SchemaObject(`type` = Some(SchemaObjectType.`string`), readOnly = Some(true))
 
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/ast/AstTranslationSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/ast/AstTranslationSpec.scala
@@ -1,10 +1,10 @@
 package com.enfore.apis.ast
 
 import cats.data.NonEmptyList
+import cats.syntax.functor._
 import com.enfore.apis.ast.ASTTranslationFunctions.PackageName
 import com.enfore.apis.ast.SwaggerAST._
 import com.enfore.apis.repr.ReqWithContentType.{PATCH, POST}
-import com.enfore.apis.repr.{PathItemAggregation, RequestWithPayload, TypeRepr}
 import com.enfore.apis.repr.TypeRepr.{
   Maximum,
   Minimum,
@@ -21,15 +21,16 @@ import com.enfore.apis.repr.TypeRepr.{
   PrimitiveUnion,
   Ref
 }
-import org.scalatest._
+import com.enfore.apis.repr.{PathItemAggregation, RequestWithPayload, TypeRepr}
 import io.circe
 import io.circe._
-import cats.syntax.functor._
 import io.circe.generic.auto._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
 
 import scala.io.Source
 
-class AstTranslationSpec extends FlatSpec with Matchers {
+class AstTranslationSpec extends AnyFlatSpec with should.Matchers {
 
   implicit val decoder: Decoder[SchemaOrReferenceObject] =
     List[Decoder[SchemaOrReferenceObject]](
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/ast/ReadRoutesToInteropSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/ast/ReadRoutesToInteropSpec.scala
@@ -1,25 +1,15 @@
 package com.enfore.apis.ast
 
 import com.enfore.apis.ast.ASTTranslationFunctions.PackageName
-import com.enfore.apis.ast.SwaggerAST.{
-  ComponentsObject,
-  CoreASTRepr,
-  MediaTypeObject,
-  OperationObject,
-  ParameterObject,
-  ReferenceObject,
-  RequestBodyObject,
-  ResponseObject,
-  SchemaObject,
-  SchemaObjectType
-}
 import com.enfore.apis.ast.SwaggerAST.ParameterLocation.path
+import com.enfore.apis.ast.SwaggerAST._
 import com.enfore.apis.repr.ReqWithContentType.PUT
 import com.enfore.apis.repr.TypeRepr.Ref
 import com.enfore.apis.repr.{GetRequest, PathItemAggregation, PathParameter, RequestWithPayload}
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
 
-class ReadRoutesToInteropSpec extends FlatSpec with Matchers {
+class ReadRoutesToInteropSpec extends AnyFlatSpec with should.Matchers {
   "readRoutesToInerop" should "be able to read multiple methods per route" in {
     val expected = Map(
       "_contacts_individual_{contact-id}" ->
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/generator/ComponentsTypeReprSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/generator/ComponentsTypeReprSpec.scala
@@ -2,11 +2,12 @@ package com.enfore.apis.generator
 
 import cats.data.NonEmptyList
 import com.enfore.apis.repr.TypeRepr
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
 
 import scala.meta._
 
-class ComponentsTypeReprSpec extends FlatSpec with Matchers {
+class ComponentsTypeReprSpec extends AnyFlatSpec with should.Matchers {
   import TypeRepr._
 
   "ComponentsObject TypeRepr Generator" should "be able to generate a basic case class" in {
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/generator/PathInterfaceGeneratorSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/generator/PathInterfaceGeneratorSpec.scala
@@ -3,11 +3,12 @@ package com.enfore.apis.generator
 import com.enfore.apis.ast.ASTTranslationFunctions.PackageName
 import com.enfore.apis.repr.TypeRepr.{Ref => TypeReprRef}
 import com.enfore.apis.repr.{GetRequest, PathParameter, ReqWithContentType, RequestWithPayload}
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
 
 import scala.meta._
 
-class PathInterfaceGeneratorSpec extends FlatSpec with Matchers {
+class PathInterfaceGeneratorSpec extends AnyFlatSpec with should.Matchers {
 
   implicit val packageName: PackageName = PackageName("com.enfore.apis")
 
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/generator/SymbolAnnotationMakerSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/generator/SymbolAnnotationMakerSpec.scala
@@ -2,9 +2,10 @@ package com.enfore.apis.generator
 
 import cats.data.NonEmptyList
 import com.enfore.apis.repr.TypeRepr.{MaxLength, MinLength, PrimitiveString}
-import org.scalatest._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should
 
-class SymbolAnnotationMakerSpec extends FlatSpec with Matchers {
+class SymbolAnnotationMakerSpec extends AnyFlatSpec with should.Matchers {
 
   "dataRefinementMatcher" should "generate proper type signatures for refined primitives" in {
     val op: String =
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/generator/UtilitiesTest.scala b/openapi-scala/src/test/scala/com/enfore/apis/generator/UtilitiesTest.scala
@@ -1,8 +1,8 @@
 package com.enfore.apis.generator
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
-class UtilitiesTest extends FunSuite {
+class UtilitiesTest extends AnyFunSuite {
   test("cleanScalaSymbolEnum") {
     assert(Utilities.cleanScalaSymbolEnum("DE_STANDARD_VAT_2007") === "DE_STANDARD_VAT_2007")
   }
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/generator/http4s/Http4sGeneratorSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/generator/http4s/Http4sGeneratorSpec.scala
@@ -2,12 +2,14 @@ package com.enfore.apis.generator.http4s
 
 import com.enfore.apis.ast.ASTTranslationFunctions.PackageName
 import com.enfore.apis.repr.{GetRequest, PathItemAggregation, TypeRepr}
-import org.scalatest.{Assertion, FreeSpec, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should
 
 import scala.collection.immutable.ListMap
 import scala.meta._
 
-class Http4sGeneratorSpec extends FreeSpec with Matchers {
+class Http4sGeneratorSpec extends AnyFreeSpec with should.Matchers {
   "The Http4sGenerator generates sources which directly use and utilise http4s as a server library" - {
     "It generates a file containing the routes" in routesTest
     "It generates a file containing a trait representing the implementation used by the routes" in implementationTest
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/generator/http4s/ImplementationGeneratorSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/generator/http4s/ImplementationGeneratorSpec.scala
@@ -1,9 +1,10 @@
 package com.enfore.apis.generator.http4s
 
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should
 import org.scalatest.prop.TableDrivenPropertyChecks._
 
-class ImplementationGeneratorSpec extends FreeSpec with Matchers {
+class ImplementationGeneratorSpec extends AnyFreeSpec with should.Matchers {
   "http4s.ImplementationGenerator generates trait methods for the implementation " +
     "based on http4s according to provided route definiton" in tableTest
 
diff --git a/openapi-scala/src/test/scala/com/enfore/apis/generator/http4s/RouteGeneratorSpec.scala b/openapi-scala/src/test/scala/com/enfore/apis/generator/http4s/RouteGeneratorSpec.scala
@@ -1,9 +1,10 @@
 package com.enfore.apis.generator.http4s
 
-import org.scalatest.{FreeSpec, Matchers}
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.matchers.should
 import org.scalatest.prop.TableDrivenPropertyChecks._
 
-class RouteGeneratorSpec extends FreeSpec with Matchers {
+class RouteGeneratorSpec extends AnyFreeSpec with should.Matchers {
   "http4s.RouteGenerator generates routes based on http4s according to provided route definiton" in tableTest
 
   def tableTest = forEvery(table) { (pathItem, sourceStrings) =>
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,14 +1,14 @@
 // Code auto-formatting with compile
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.6")
 
 // Code style hints
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 
 // Build Plugin
-addSbtPlugin("com.enfore" % "sbt-n4build" % "1.0.3")
+addSbtPlugin("com.enfore" % "sbt-n4build" % "1.1.1")
 
 // Code coverage
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 
 // Dependency graph generation
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
diff --git a/project/repositories.sbt b/project/repositories.sbt
@@ -1,9 +1,7 @@
 ThisBuild / resolvers := Seq(
-  ("n4-public" at "http://nexus-aws.corp.numberfour.eu/nexus/content/repositories/public/")
-    .withAllowInsecureProtocol(true),
+  ("n4-public" at "https://nexus3.internal.numberfour.eu/repository/maven-public/"),
   (Resolver
-    .url("n4-public-ivy", new java.net.URL("http://nexus-aws.corp.numberfour.eu/nexus/content/repositories/public/"))(
+    .url("n4-public-ivy", new java.net.URL("https://nexus3.internal.numberfour.eu/repository/maven-public/"))(
       Patterns(
         "[organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]")))
-    .withAllowInsecureProtocol(true)
 )

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.enfore.apis.generator`
`2`	`2`
`3`		`-import org.scalatest.FunSuite`
	`3`	`+import org.scalatest.funsuite.AnyFunSuite`
`4`	`4`
`5`		`-class UtilitiesTest extends FunSuite {`
	`5`	`+class UtilitiesTest extends AnyFunSuite {`
`6`	`6`	`test("cleanScalaSymbolEnum") {`
`7`	`7`	`assert(Utilities.cleanScalaSymbolEnum("DE_STANDARD_VAT_2007") === "DE_STANDARD_VAT_2007")`
`8`	`8`	`}`