Skip to content

Commit 2d7b4ef

Browse files
authored
Update scala-native to 0.5.1, drop Scala 2.11 (#389)
1 parent 995ae00 commit 2d7b4ef

File tree

3 files changed

+5
-24
lines changed

3 files changed

+5
-24
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Add the following dependency:
1919
"com.softwaremill.sttp.shared" %% "core" % "1.3.17"
2020
```
2121

22-
sttp model is available for Scala 2.11, 2.12, 2.13, 3.0.0-Mx, Scala.JS and Scala Native.
22+
sttp-shared is available for Scala 2.12, 2.13, 3.3, Scala.JS and Scala Native.
2323

2424
### Building & testing the scala-native version
2525

build.sbt

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
33
import com.softwaremill.Publish.ossPublishSettings
44
import com.typesafe.tools.mima.core._
55

6-
val scala2_11 = "2.11.12"
76
val scala2_12 = "2.12.19"
87
val scala2_13 = "2.13.13"
9-
val scala2 = List(scala2_11, scala2_12, scala2_13)
8+
val scala2 = List(scala2_12, scala2_13)
109
val scala2alive = List(scala2_12, scala2_13)
1110
val scala3 = List("3.3.3")
1211
val akkaVersion = "2.6.20"
1312
val pekkoVersion = "1.0.2"
14-
val sttpModelVersion = "1.6.0"
13+
val sttpModelVersion = "1.7.10"
1514

1615
val scalaTestVersion = "3.2.18"
1716
val zio1Version = "1.0.18"
@@ -38,7 +37,6 @@ val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
3837
)
3938

4039
val commonJvmSettings = commonSettings ++ Seq(
41-
scalacOptions ++= Seq("-target:jvm-1.8"),
4240
ideSkipProject := (scalaVersion.value != scala2_13),
4341
bspEnabled := !ideSkipProject.value,
4442
mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %% moduleName.value % _).toSet,
@@ -69,7 +67,6 @@ val commonJsSettings = commonSettings ++ Seq(
6967
)
7068

7169
val commonNativeSettings = commonSettings ++ Seq(
72-
nativeLinkStubs := true,
7370
ideSkipProject := true,
7471
libraryDependencies ++= Seq(
7572
"org.scala-native" %%% "test-interface" % nativeVersion
@@ -95,15 +92,7 @@ lazy val rootProject = (project in file("."))
9592
.aggregate(projectAggregates: _*)
9693

9794
lazy val core = (projectMatrix in file("core"))
98-
.settings(
99-
name := "core",
100-
mimaBinaryIssueFilters ++= {
101-
if (scalaVersion.value == scala2_11) {
102-
// excluding this for 2.11 as the `blocking` method will only ever be called in recompiled library code
103-
Seq(ProblemFilters.exclude[ReversedMissingMethodProblem]("sttp.monad.MonadError.blocking"))
104-
} else Nil
105-
}
106-
)
95+
.settings(name := "core")
10796
.jvmPlatform(
10897
scalaVersions = scala2 ++ scala3,
10998
settings = commonJvmSettings
@@ -214,10 +203,6 @@ lazy val fs2 = (projectMatrix in file("fs2"))
214203
scalaVersions = scala2alive ++ scala3,
215204
settings = commonJsSettings ++ browserChromeTestSettings
216205
)
217-
.nativePlatform(
218-
scalaVersions = scala2alive ++ scala3,
219-
settings = commonNativeSettings
220-
)
221206
.dependsOn(core)
222207

223208
lazy val monix = (projectMatrix in file("monix"))
@@ -263,10 +248,6 @@ lazy val zio = (projectMatrix in file("zio"))
263248
scalaVersions = scala2alive ++ scala3,
264249
settings = commonJsSettings ++ browserChromeTestSettings
265250
)
266-
.nativePlatform(
267-
scalaVersions = scala2alive ++ scala3,
268-
settings = commonNativeSettings
269-
)
270251
.dependsOn(core)
271252

272253
lazy val vertx = (projectMatrix in file("vertx"))

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
44
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
55

66
val sbtSoftwareMillVersion = "2.0.20"

0 commit comments

Comments
 (0)