@@ -35,6 +35,14 @@ val setMimaVersion: State => State = { st =>
35
35
}
36
36
37
37
val commonSettings = Def .settings(
38
+ Test / sources := {
39
+ CrossVersion .partialVersion(scalaVersion.value) match {
40
+ case Some ((2 , _)) =>
41
+ (Test / sources).value
42
+ case _ =>
43
+ Nil // TODO https://github.com/msgpack4z/msgpack4z-core/issues/134
44
+ }
45
+ },
38
46
ReleasePlugin .extraReleaseCommands,
39
47
scalapropsCoreSettings,
40
48
publishTo := sonatypePublishToBundle.value,
@@ -115,7 +123,7 @@ val commonSettings = Def.settings(
115
123
.toList
116
124
.flatten,
117
125
scalaVersion := Scala211 ,
118
- crossScalaVersions := Scala211 :: " 2.12.13" :: " 2.13.4" :: Nil ,
126
+ crossScalaVersions := Scala211 :: " 2.12.13" :: " 2.13.4" :: " 3.0.0-M3 " :: Nil ,
119
127
scalacOptions in (Compile , doc) ++= {
120
128
val tag = tagOrHash.value
121
129
Seq (
@@ -166,11 +174,19 @@ lazy val msgpack4zCore = CrossProject(
166
174
Generator .settings,
167
175
name := msgpack4zCoreName,
168
176
libraryDependencies ++= Seq (
169
- " org.scalaz" %%% " scalaz-core" % ScalazVersion ,
170
- " com.github.xuwei-k" %% " zeroapply-scalaz" % " 0.4.1" % " provided" ,
171
- " com.github.scalaprops" %%% " scalaprops" % scalapropsVersion % " test" ,
172
- " com.github.scalaprops" %%% " scalaprops-scalaz" % scalapropsVersion % " test" ,
173
- )
177
+ " org.scalaz" %%% " scalaz-core" % ScalazVersion withDottyCompat scalaVersion.value,
178
+ " com.github.scalaprops" %%% " scalaprops" % scalapropsVersion % " test" withDottyCompat scalaVersion.value,
179
+ " com.github.scalaprops" %%% " scalaprops-scalaz" % scalapropsVersion % " test" withDottyCompat scalaVersion.value,
180
+ ),
181
+ libraryDependencies += {
182
+ val x = " com.github.xuwei-k" %% " zeroapply-scalaz" % " 0.4.1"
183
+ CrossVersion .partialVersion(scalaVersion.value) match {
184
+ case Some ((2 , _)) =>
185
+ x % " provided"
186
+ case _ =>
187
+ x // https://github.com/xuwei-k/zeroapply/issues/104
188
+ }
189
+ }
174
190
).enablePlugins(
175
191
MimaPlugin ,
176
192
sbtbuildinfo.BuildInfoPlugin
@@ -179,7 +195,7 @@ lazy val msgpack4zCore = CrossProject(
179
195
libraryDependencies ++= Seq (
180
196
" com.github.xuwei-k" % " msgpack4z-api" % " 0.2.0" ,
181
197
" com.github.xuwei-k" % " msgpack4z-java06" % " 0.2.0" % " test" ,
182
- " com.github.xuwei-k" %% " msgpack4z-native" % msgpack4zNativeVersion % " test" ,
198
+ " com.github.xuwei-k" %% " msgpack4z-native" % msgpack4zNativeVersion % " test" withDottyCompat scalaVersion.value ,
183
199
)
184
200
).jsSettings(
185
201
scalacOptions += {
@@ -195,7 +211,7 @@ lazy val msgpack4zCore = CrossProject(
195
211
scalaJSLinkerConfig ~= { _.withSemantics(_.withStrictFloats(true )) },
196
212
).platformsSettings(NativePlatform , JSPlatform )(
197
213
libraryDependencies ++= Seq (
198
- " com.github.xuwei-k" %%% " msgpack4z-native" % msgpack4zNativeVersion,
214
+ " com.github.xuwei-k" %%% " msgpack4z-native" % msgpack4zNativeVersion withDottyCompat scalaVersion.value ,
199
215
)
200
216
)
201
217
@@ -212,7 +228,8 @@ lazy val noPublish = Seq(
212
228
lazy val msgpack4zCoreJVM = msgpack4zCore.jvm
213
229
lazy val msgpack4zCoreJS = msgpack4zCore.js
214
230
lazy val msgpack4zCoreNative = msgpack4zCore.native.settings(
215
- scalapropsNativeSettings
231
+ scalapropsNativeSettings,
232
+ crossScalaVersions ~= (_.filter(_ startsWith " 2.1" ))
216
233
)
217
234
218
235
val subProjects = List (
0 commit comments