@@ -122,12 +122,12 @@ lazy val compat = new MultiScalaCrossProject(
122
122
},
123
123
Test / unmanagedSourceDirectories += (ThisBuild / baseDirectory).value / " compat/src/test/scala-js" ,
124
124
Compile / unmanagedSourceDirectories += {
125
- val jsParent = (ThisBuild / baseDirectory).value / " compat/js /src/main"
125
+ val jsAndNativeSourcesParent = (ThisBuild / baseDirectory).value / " compat/jsNative /src/main"
126
126
CrossVersion .partialVersion(scalaVersion.value) match {
127
127
case Some ((3 , _) | (2 , 13 )) =>
128
- jsParent / " scala-2.13"
128
+ jsAndNativeSourcesParent / " scala-2.13"
129
129
case _ =>
130
- jsParent / " scala-2.11_2.12"
130
+ jsAndNativeSourcesParent / " scala-2.11_2.12"
131
131
}
132
132
},
133
133
Test / fork := false // Scala.js cannot run forked tests
@@ -141,6 +141,15 @@ lazy val compat = new MultiScalaCrossProject(
141
141
case Some ((3 , 1 )) => mimaPreviousArtifacts.value.filter(_.revision != " 2.6.0" )
142
142
case _ => mimaPreviousArtifacts.value
143
143
}),
144
+ Compile / unmanagedSourceDirectories += {
145
+ val jsAndNativeSourcesParent = (ThisBuild / baseDirectory).value / " compat/jsNative/src/main"
146
+ CrossVersion .partialVersion(scalaVersion.value) match {
147
+ case Some ((3 , _) | (2 , 13 )) =>
148
+ jsAndNativeSourcesParent / " scala-2.13"
149
+ case _ =>
150
+ jsAndNativeSourcesParent / " scala-2.11_2.12"
151
+ }
152
+ },
144
153
libraryDependencies += " org.scala-native" %%% " junit-runtime" % nativeVersion,
145
154
Test / fork := false // Scala Native cannot run forked tests
146
155
)
0 commit comments