diff --git a/README.md b/README.md index eb3c1cf..59604a0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Add the following dependency: "com.softwaremill.sttp.shared" %% "core" % "1.3.17" ``` -sttp model is available for Scala 2.11, 2.12, 2.13, 3.0.0-Mx, Scala.JS and Scala Native. +sttp-shared is available for Scala 2.12, 2.13, 3.3, Scala.JS and Scala Native. ### Building & testing the scala-native version diff --git a/build.sbt b/build.sbt index b6894ca..830551b 100644 --- a/build.sbt +++ b/build.sbt @@ -3,15 +3,14 @@ import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings import com.softwaremill.Publish.ossPublishSettings import com.typesafe.tools.mima.core._ -val scala2_11 = "2.11.12" val scala2_12 = "2.12.19" val scala2_13 = "2.13.13" -val scala2 = List(scala2_11, scala2_12, scala2_13) +val scala2 = List(scala2_12, scala2_13) val scala2alive = List(scala2_12, scala2_13) val scala3 = List("3.3.3") val akkaVersion = "2.6.20" val pekkoVersion = "1.0.2" -val sttpModelVersion = "1.6.0" +val sttpModelVersion = "1.7.10" val scalaTestVersion = "3.2.18" val zio1Version = "1.0.18" @@ -38,7 +37,6 @@ val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq( ) val commonJvmSettings = commonSettings ++ Seq( - scalacOptions ++= Seq("-target:jvm-1.8"), ideSkipProject := (scalaVersion.value != scala2_13), bspEnabled := !ideSkipProject.value, mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %% moduleName.value % _).toSet, @@ -69,7 +67,6 @@ val commonJsSettings = commonSettings ++ Seq( ) val commonNativeSettings = commonSettings ++ Seq( - nativeLinkStubs := true, ideSkipProject := true, libraryDependencies ++= Seq( "org.scala-native" %%% "test-interface" % nativeVersion @@ -95,15 +92,7 @@ lazy val rootProject = (project in file(".")) .aggregate(projectAggregates: _*) lazy val core = (projectMatrix in file("core")) - .settings( - name := "core", - mimaBinaryIssueFilters ++= { - if (scalaVersion.value == scala2_11) { - // excluding this for 2.11 as the `blocking` method will only ever be called in recompiled library code - Seq(ProblemFilters.exclude[ReversedMissingMethodProblem]("sttp.monad.MonadError.blocking")) - } else Nil - } - ) + .settings(name := "core") .jvmPlatform( scalaVersions = scala2 ++ scala3, settings = commonJvmSettings @@ -214,10 +203,6 @@ lazy val fs2 = (projectMatrix in file("fs2")) scalaVersions = scala2alive ++ scala3, settings = commonJsSettings ++ browserChromeTestSettings ) - .nativePlatform( - scalaVersions = scala2alive ++ scala3, - settings = commonNativeSettings - ) .dependsOn(core) lazy val monix = (projectMatrix in file("monix")) @@ -263,10 +248,6 @@ lazy val zio = (projectMatrix in file("zio")) scalaVersions = scala2alive ++ scala3, settings = commonJsSettings ++ browserChromeTestSettings ) - .nativePlatform( - scalaVersions = scala2alive ++ scala3, - settings = commonNativeSettings - ) .dependsOn(core) lazy val vertx = (projectMatrix in file("vertx")) diff --git a/project/plugins.sbt b/project/plugins.sbt index 99cf79f..6b5f95e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") val sbtSoftwareMillVersion = "2.0.20"