From cb5486597da541277931c57a113095d4a2261047 Mon Sep 17 00:00:00 2001 From: Bendix Saeltz Date: Thu, 18 Feb 2021 16:03:01 +0100 Subject: [PATCH 1/3] Add versionScheme Signed-off-by: Bendix Saeltz --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 21ce099..4a62a3c 100644 --- a/build.sbt +++ b/build.sbt @@ -7,6 +7,7 @@ lazy val root = (project in file(".")) homepage := Some(url("https://github.com/moia-dev/scala-http-client")), scalaVersion := "2.13.4", crossScalaVersions := List("2.13.4", "2.12.13"), + versionScheme := Some("early-semver"), scalacOptions ++= { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12)) => scalacOptions_2_12 From c47f5c57a872e2a35edc0436f26b53a13406e4ed Mon Sep 17 00:00:00 2001 From: Bendix Saeltz Date: Thu, 18 Feb 2021 16:04:13 +0100 Subject: [PATCH 2/3] Update organization Signed-off-by: Bendix Saeltz --- README.md | 6 +++--- build.sbt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 12cb132..6ff2163 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This is a wrapper around the akka-http-client that adds * logging * AWS request signing -![Build & Test](https://github.com/moia-dev/scala-http-client/workflows/Build%20&%20Test/badge.svg) +![Build & Test](https://github.com/moia-oss/scala-http-client/workflows/Build%20&%20Test/badge.svg) [![Scala 2.13](https://img.shields.io/maven-central/v/io.moia/scala-http-client_2.13.svg)](https://search.maven.org/search?q=scala-http-client_2.13) ## Usage @@ -149,7 +149,7 @@ See [HeaderExample.scala](/src/it/scala/io/moia/scalaHttpClient/HeaderExample.sc ## Publishing -[Tag](https://github.com/moia-dev/scala-http-client/tags) the new version (e.g. `v3.0.0`) and push the tags (`git push origin --tags`). +[Tag](https://github.com/moia-oss/scala-http-client/tags) the new version (e.g. `v3.0.0`) and push the tags (`git push origin --tags`). You need a [public GPG key](https://www.scala-sbt.org/release/docs/Using-Sonatype.html) with your MOIA email and an account on https://oss.sonatype.org that can [access](https://issues.sonatype.org/browse/OSSRH-52948) the `io.moia` group. @@ -160,4 +160,4 @@ sbt:scala-http-client> +publishSigned Then head to https://oss.sonatype.org/#stagingRepositories, select the repository, `Close` and then `Release` it. -Afterwards, add the release to [GitHub](https://github.com/moia-dev/scala-http-client/releases). +Afterwards, add the release to [GitHub](https://github.com/moia-oss/scala-http-client/releases). diff --git a/build.sbt b/build.sbt index 4a62a3c..399aa23 100644 --- a/build.sbt +++ b/build.sbt @@ -3,8 +3,8 @@ lazy val root = (project in file(".")) name := "scala-http-client", organization := "io.moia", licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")), - scmInfo := Some(ScmInfo(url("https://github.com/moia-dev/scala-http-client"), "scm:git@github.com:moia-dev/scala-http-client.git")), - homepage := Some(url("https://github.com/moia-dev/scala-http-client")), + scmInfo := Some(ScmInfo(url("https://github.com/moia-oss/scala-http-client"), "scm:git@github.com:moia-oss/scala-http-client.git")), + homepage := Some(url("https://github.com/moia-oss/scala-http-client")), scalaVersion := "2.13.4", crossScalaVersions := List("2.13.4", "2.12.13"), versionScheme := Some("early-semver"), @@ -100,7 +100,7 @@ lazy val sonatypeSettings = { publishTo := sonatypePublishTo.value, sonatypeProfileName := organization.value, publishMavenStyle := true, - sonatypeProjectHosting := Some(GitHubHosting("moia-dev", "scala-http-client", "oss-support@moia.io")), + sonatypeProjectHosting := Some(GitHubHosting("moia-oss", "scala-http-client", "oss-support@moia.io")), credentials += Credentials(Path.userHome / ".sbt" / "sonatype_credential") ) } From 8fb1b33cdd5d0a13cd8f2df8d24b135a79ffb1b7 Mon Sep 17 00:00:00 2001 From: Bendix Saeltz Date: Thu, 18 Feb 2021 16:04:38 +0100 Subject: [PATCH 3/3] Add mima Signed-off-by: Bendix Saeltz --- .github/workflows/buildAndTest.yml | 15 +++++++++++++++ build.sbt | 5 +++++ project/plugins.sbt | 3 +++ 3 files changed, 23 insertions(+) diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml index 1cb4ebd..f364049 100644 --- a/.github/workflows/buildAndTest.yml +++ b/.github/workflows/buildAndTest.yml @@ -77,3 +77,18 @@ jobs: key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('**/build.sbt') }}-${{ hashFiles('**/plugins.sbt') }}-${{ hashFiles('**/build.properties') }} - name: Run scapegoat run: sbt scapegoat + + mima: + name: Report Binary Issues + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Cache SBT & ivy cache + uses: actions/cache@v2 + with: + path: | + ~/.ivy2/cache + ~/.sbt + key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('**/build.sbt') }}-${{ hashFiles('**/plugins.sbt') }}-${{ hashFiles('**/build.properties') }} + - name: Run mima + run: sbt mimaReportBinaryIssues diff --git a/build.sbt b/build.sbt index 399aa23..afc9428 100644 --- a/build.sbt +++ b/build.sbt @@ -29,6 +29,7 @@ lazy val root = (project in file(".")) GitVersioning, GitBranchPrompt ) + .settings(mimaSettings) val akkaVersion = "2.6.12" val akkaHttpVersion = "10.2.3" @@ -118,3 +119,7 @@ lazy val sbtGitSettings = Seq( case _ => None } ) + +lazy val mimaSettings = Seq( + mimaPreviousArtifacts := Set("io.moia" %% "scala-http-client" % "4.0.0") +) diff --git a/project/plugins.sbt b/project/plugins.sbt index bb1c0fe..e8940cd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -14,3 +14,6 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0") + +// sbt> mimaReportBinaryIssues +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")