@@ -3,15 +3,14 @@ import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
3
3
import com .softwaremill .Publish .ossPublishSettings
4
4
import com .typesafe .tools .mima .core ._
5
5
6
- val scala2_11 = " 2.11.12"
7
6
val scala2_12 = " 2.12.19"
8
7
val scala2_13 = " 2.13.13"
9
- val scala2 = List (scala2_11, scala2_12, scala2_13)
8
+ val scala2 = List (scala2_12, scala2_13)
10
9
val scala2alive = List (scala2_12, scala2_13)
11
10
val scala3 = List (" 3.3.3" )
12
11
val akkaVersion = " 2.6.20"
13
12
val pekkoVersion = " 1.0.2"
14
- val sttpModelVersion = " 1.6.0 "
13
+ val sttpModelVersion = " 1.7.10 "
15
14
16
15
val scalaTestVersion = " 3.2.18"
17
16
val zio1Version = " 1.0.18"
@@ -38,7 +37,6 @@ val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
38
37
)
39
38
40
39
val commonJvmSettings = commonSettings ++ Seq (
41
- scalacOptions ++= Seq (" -target:jvm-1.8" ),
42
40
ideSkipProject := (scalaVersion.value != scala2_13),
43
41
bspEnabled := ! ideSkipProject.value,
44
42
mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %% moduleName.value % _).toSet,
@@ -69,7 +67,6 @@ val commonJsSettings = commonSettings ++ Seq(
69
67
)
70
68
71
69
val commonNativeSettings = commonSettings ++ Seq (
72
- nativeLinkStubs := true ,
73
70
ideSkipProject := true ,
74
71
libraryDependencies ++= Seq (
75
72
" org.scala-native" %%% " test-interface" % nativeVersion
@@ -95,15 +92,7 @@ lazy val rootProject = (project in file("."))
95
92
.aggregate(projectAggregates : _* )
96
93
97
94
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" )
107
96
.jvmPlatform(
108
97
scalaVersions = scala2 ++ scala3,
109
98
settings = commonJvmSettings
@@ -214,10 +203,6 @@ lazy val fs2 = (projectMatrix in file("fs2"))
214
203
scalaVersions = scala2alive ++ scala3,
215
204
settings = commonJsSettings ++ browserChromeTestSettings
216
205
)
217
- .nativePlatform(
218
- scalaVersions = scala2alive ++ scala3,
219
- settings = commonNativeSettings
220
- )
221
206
.dependsOn(core)
222
207
223
208
lazy val monix = (projectMatrix in file(" monix" ))
@@ -263,10 +248,6 @@ lazy val zio = (projectMatrix in file("zio"))
263
248
scalaVersions = scala2alive ++ scala3,
264
249
settings = commonJsSettings ++ browserChromeTestSettings
265
250
)
266
- .nativePlatform(
267
- scalaVersions = scala2alive ++ scala3,
268
- settings = commonNativeSettings
269
- )
270
251
.dependsOn(core)
271
252
272
253
lazy val vertx = (projectMatrix in file(" vertx" ))
0 commit comments