Skip to content

Commit ea39cf0

Browse files
committed
update headers with sbt-header
1 parent 882936d commit ea39cf0

File tree

6 files changed

+25
-3
lines changed

6 files changed

+25
-3
lines changed

build.sbt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
val sharedSettings = ScalaModulePlugin.scalaModuleSettings ++ ScalaModulePlugin.scalaModuleOsgiSettings ++ Seq(
22
name := "scala-async",
33
scalaModuleAutomaticModuleName := Some("scala.async"),
4-
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
54

65
crossScalaVersions := Seq("2.13.6", "2.12.14"),
76
scalaVersion := crossScalaVersions.value.head,
@@ -15,16 +14,23 @@ val sharedSettings = ScalaModulePlugin.scalaModuleSettings ++ ScalaModulePlugin.
1514
ScalaModulePlugin.enableOptimizer,
1615
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s"),
1716
Test / scalacOptions ++= Seq("-Yrangepos"),
18-
scalacOptions ++= List("-deprecation" , "-Xasync")
17+
scalacOptions ++= List("-deprecation" , "-Xasync"),
1918
)
2019

2120
lazy val proj = crossProject(JSPlatform, JVMPlatform)
2221
.withoutSuffixFor(JVMPlatform)
2322
.crossType(CrossType.Pure)
2423
.in(file("."))
2524
.settings(sharedSettings)
25+
// until we have actually published for Scala.js
26+
.jvmSettings(versionPolicyIntention := Compatibility.BinaryAndSourceCompatible)
27+
.jsSettings(versionPolicyIntention := Compatibility.None)
28+
// override sbt-scala-module default (which is unsuitable for Scala.js)
29+
.jsSettings(Test / fork := false)
2630

27-
lazy val root = project.in(file(".")).settings(sharedSettings)
31+
lazy val root = project.in(file("."))
32+
.settings(sharedSettings)
33+
.aggregate(proj.jvm, proj.js)
2834

2935
Global / parallelExecution := false
3036

src/main/scala/scala/async/FutureStateMachine.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* See the NOTICE file distributed with this work for
1010
* additional information regarding copyright ownership.
1111
*/
12+
1213
package scala.async
1314

1415
import java.util.Objects

src/test/scala/scala/async/ExceptionalTest.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.async
214

315
import java.util.concurrent.atomic.AtomicReference

src/test/scala/scala/async/FutureSpec.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* See the NOTICE file distributed with this work for
1010
* additional information regarding copyright ownership.
1111
*/
12+
1213
package scala.async
1314

1415
import java.util.concurrent.ConcurrentHashMap

src/test/scala/scala/async/SmokeTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* See the NOTICE file distributed with this work for
1010
* additional information regarding copyright ownership.
1111
*/
12+
1213
package scala.async
1314

1415
import org.junit.{Assert, Test}

src/test/scala/scala/async/TestUtil.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* See the NOTICE file distributed with this work for
1010
* additional information regarding copyright ownership.
1111
*/
12+
1213
package scala.async
1314

1415
import java.util.concurrent.{CountDownLatch, TimeUnit}

0 commit comments

Comments
 (0)