diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bea49eb..7d6ce28 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,4 +23,4 @@ jobs: PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - CI_SONATYPE_RELEASE: sonatypeBundleRelease + CI_SONATYPE_RELEASE: sonaBundle diff --git a/.gitignore b/.gitignore index b729095..341950f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,10 @@ project/plugins/project/ # Scala-IDE specific .scala_dependencies .worksheet - .idea - /.bsp/sbt.json + +# VsCode extensions +.metals +metals.sbt +.bloop diff --git a/build.sbt b/build.sbt index 294b045..4addcfc 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,4 @@ import sbt.Keys.{crossScalaVersions, scalacOptions} -import xerial.sbt.Sonatype._ val playJsonVersion = "3.0.5" val playVersion = "2.7.3" // test only @@ -17,7 +16,6 @@ crossScalaVersions := Seq(scala2_12, scala2_13) releaseCrossBuild := true -ThisBuild / publishTo := sonatypePublishToBundle.value ThisBuild / scalacOptions ++= Seq("-unchecked", "-deprecation") // we need both Test and IntegrationTest scopes for a correct pom, see https://github.com/sbt/sbt/issues/1380 @@ -59,14 +57,12 @@ lazy val root = (project in file(".")) "org.playframework" %% "play-json" % playJsonVersion, "com.typesafe.play" %% "play-ws-standalone" % playWsVersion, "com.typesafe.play" %% "play-ws-standalone-json" % playWsVersion, - // "com.typesafe.scala-logging" %% "scala-logging" % "3.1.0", "org.slf4j" % "slf4j-api" % slf4jVersion, "org.slf4j" % "jcl-over-slf4j" % slf4jVersion, // TEST "ch.qos.logback" % "logback-classic" % logbackVersion % TestAndIntegrationTest, "org.specs2" %% "specs2-core" % specs2Version % TestAndIntegrationTest, "org.specs2" %% "specs2-junit" % specs2Version % TestAndIntegrationTest, - // "com.typesafe.play" %% "play-ahc-ws" % playVersion % TestAndIntegrationTest, // neede for play-mockws "com.typesafe.play" %% "play-ahc-ws-standalone" % playWsVersion % TestAndIntegrationTest, "com.whisk" %% "docker-testkit-core" % dockerTestkitVersion % TestAndIntegrationTest excludeAll (nettyExclusions: _*) ).map(_.excludeAll(libraryExclusions: _*)) diff --git a/project/plugins.sbt b/project/plugins.sbt index f260154..55310a5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,4 +5,3 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.7.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")