11import sbtcrossproject .crossProject
22
3- crossScalaVersions in ThisBuild := Seq (" 2.12.19" , " 2.13.14" )
4- scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild ).value.head
5-
3+ ThisBuild / crossScalaVersions := Seq (" 2.12.19" , " 2.13.14" , " 3.3.3" )
4+ ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last
65val commonSettings : Seq [Setting [_]] = Seq (
76 version := " 1.0.0-SNAPSHOT" ,
87 organization := " org.scala-native" ,
9- scalacOptions ++= Seq (" -deprecation" , " -feature" ),
10-
8+ scalacOptions ++= Seq (" -deprecation" , " -feature" , " -release:8" ),
119 homepage := Some (url(" http://scala-native.org/" )),
1210 licenses += (" BSD New" ,
1311 url(" https://github.com/scala-native/scala-native-java-logging/blob/main/LICENSE" )),
@@ -17,17 +15,18 @@ val commonSettings: Seq[Setting[_]] = Seq(
1715 Some (" scm:git:git@github.com:scala-native/scala-native-java-logging.git" )))
1816)
1917
20- lazy val root : Project = project.in(file(" ." )).
21- enablePlugins(ScalaNativePlugin ).
22- settings(commonSettings).
23- settings(
18+ lazy val root : Project = project
19+ .in(file(" ." ))
20+ .enablePlugins(ScalaNativePlugin )
21+ .settings(commonSettings)
22+ .settings(
2423 name := " scala-native-java-logging" ,
25-
26- mappings in (Compile , packageBin) ~= {
27- _.filter(! _._2.endsWith(" .class" ))
24+ Compile / packageBin / mappings ~= {
25+ _.filterNot { case (_, path) =>
26+ Seq (" .class" , " .tasty" ).exists(path.endsWith)
27+ }
2828 },
2929 exportJars := true ,
30-
3130 publishMavenStyle := true ,
3231 publishTo := {
3332 val nexus = " https://oss.sonatype.org/"
@@ -37,7 +36,7 @@ lazy val root: Project = project.in(file(".")).
3736 Some (" releases" at nexus + " service/local/staging/deploy/maven2" )
3837 },
3938 pomExtra := (
40- <developers >
39+ <developers >
4140 <developer >
4241 <id >sjrd</id >
4342 <name >S ébastien Doeraene </name >
@@ -58,19 +57,17 @@ lazy val root: Project = project.in(file(".")).
5857 pomIncludeRepository := { _ => false }
5958 )
6059
61- lazy val testSuite = crossProject(NativePlatform , JVMPlatform ).
62- nativeConfigure(_.enablePlugins(ScalaNativeJUnitPlugin )).
63- settings(commonSettings : _* ).
64- settings(
65- testOptions +=
66- Tests .Argument (TestFramework (" com.novocode.junit.JUnitFramework" ), " -v" , " -a" )
67- ).
68- nativeSettings(
60+ lazy val testSuite = crossProject(NativePlatform , JVMPlatform )
61+ .nativeConfigure(_.enablePlugins(ScalaNativeJUnitPlugin ))
62+ .settings(commonSettings : _* )
63+ .settings(
64+ testOptions += Tests .Argument (TestFramework (" com.novocode.junit.JUnitFramework" ), " -v" , " -a" )
65+ )
66+ .nativeSettings(
6967 name := " java.logging testSuite on Native"
70- ).
71- nativeConfigure(_.dependsOn(root)).
72- jvmSettings(
68+ )
69+ . nativeConfigure(_.dependsOn(root))
70+ . jvmSettings(
7371 name := " java.logging testSuite on JVM" ,
74- libraryDependencies +=
75- " com.novocode" % " junit-interface" % " 0.9" % " test"
72+ libraryDependencies += " com.novocode" % " junit-interface" % " 0.9" % " test"
7673 )
0 commit comments