Skip to content

Commit f596493

Browse files
ekrichekrich
committed
Add Scala Native plugin and scalafmt
1 parent 6abe710 commit f596493

File tree

8 files changed

+54
-42
lines changed

8 files changed

+54
-42
lines changed

‎build.sbt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ scalaVersionsByJvm in ThisBuild := {
6060
}
6161

6262
/** Create an OSGi version range for standard Scala versioning
63-
* schemes that describes binary compatible versions. */
63+
* schemes that describes binary compatible versions. */
6464
def osgiVersionRange(version: String, requireMicro: Boolean = false): String =
65-
if(version contains '-') "${@}" // M, RC or SNAPSHOT -> exact version
66-
else if(requireMicro) "${range;[===,=+)}" // At least the same micro version
65+
if (version contains '-') "${@}" // M, RC or SNAPSHOT -> exact version
66+
else if (requireMicro) "${range;[===,=+)}" // At least the same micro version
6767
else "${range;[==,=+)}" // Any binary compatible version
6868

6969
/** Create an OSGi Import-Package version specification. */
@@ -90,7 +90,8 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform)(
9090
if (scalaVersion.value.startsWith("2.13."))
9191
Seq(s"scala.collection.compat.*;version=${version.value}")
9292
else
93-
Seq(s"scala.collection.compat.*;version=${version.value},scala.jdk.*;version=${version.value}")
93+
Seq(
94+
s"scala.collection.compat.*;version=${version.value},scala.jdk.*;version=${version.value}")
9495
},
9596
OsgiKeys.importPackage := Seq(osgiImport("*", scalaBinaryVersion.value)),
9697
OsgiKeys.privatePackage := Nil,

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ trait BuildFrom[-From, -A, +C] extends Any {
2626
def fromSpecific(from: From)(it: IterableOnce[A]): C
2727

2828
/** Get a Builder for the collection. For non-strict collection types this will use an intermediate buffer.
29-
* Building collections with `fromSpecific` is preferred because it can be lazy for lazy collections. */
29+
* Building collections with `fromSpecific` is preferred because it can be lazy for lazy collections. */
3030
def newBuilder(from: From): mutable.Builder[A, C]
3131

3232
@deprecated("Use newBuilder() instead of apply()", "2.13.0")
@@ -40,7 +40,7 @@ object BuildFrom {
4040
implicit cbf: CanBuildFrom[From, A, C]): BuildFrom[From, A, C] =
4141
new BuildFrom[From, A, C] {
4242
def fromSpecific(from: From)(it: IterableOnce[A]): C = (cbf(from) ++= it).result()
43-
def newBuilder(from: From): mutable.Builder[A, C] = cbf(from)
43+
def newBuilder(from: From): mutable.Builder[A, C] = cbf(from)
4444
}
4545

4646
// Implicit conversion derived from an implicit conversion to CanBuildFrom

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ private[compat] trait PackageShared {
156156
type IterableOnce[+X] = c.TraversableOnce[X]
157157
val IterableOnce = c.TraversableOnce
158158

159-
implicit def toMapViewExtensionMethods[K, V, C <: scala.collection.Map[K, V]](self: IterableView[(K, V), C]): MapViewExtensionMethods[K, V, C] =
159+
implicit def toMapViewExtensionMethods[K, V, C <: scala.collection.Map[K, V]](
160+
self: IterableView[(K, V), C]): MapViewExtensionMethods[K, V, C] =
160161
new MapViewExtensionMethods[K, V, C](self)
161162
}
162163

@@ -235,7 +236,10 @@ class TraversableExtensionMethods[A](private val self: c.Traversable[A]) extends
235236
def iterableFactory: GenericCompanion[Traversable] = self.companion
236237
}
237238

238-
class MapViewExtensionMethods[K, V, C <: scala.collection.Map[K, V]](private val self: IterableView[(K, V), C]) extends AnyVal {
239-
def mapValues[W, That](f: V => W)(implicit bf: CanBuildFrom[IterableView[(K, V), C], (K, W), That]): That =
239+
class MapViewExtensionMethods[K, V, C <: scala.collection.Map[K, V]](
240+
private val self: IterableView[(K, V), C])
241+
extends AnyVal {
242+
def mapValues[W, That](f: V => W)(
243+
implicit bf: CanBuildFrom[IterableView[(K, V), C], (K, W), That]): That =
240244
self.map[(K, W), That] { case (k, v) => (k, f(v)) }
241245
}

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ object ArraySeq {
256256
return false
257257

258258
val len = xs.length
259-
var i = 0
259+
var i = 0
260260
while (i < len) {
261261
if (xs(i) != ys(i))
262262
return false

‎compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,73 +15,73 @@ class CollectionConvertersTest {
1515
val it = "a b c".split(" ").iterator
1616

1717
{
18-
val j = it.asJava
18+
val j = it.asJava
1919
val je = it.asJavaEnumeration
20-
val s = (j: ju.Iterator[String]).asScala
20+
val s = (j: ju.Iterator[String]).asScala
2121
assert((s: Iterator[String]) eq it)
2222
val es = (je: ju.Enumeration[String]).asScala
2323
assert((es: Iterator[String]) eq it)
2424
}
2525

2626
{
2727
val i: c.Iterable[String] = it.to(Iterable)
28-
val j = i.asJava
29-
val jc = i.asJavaCollection
30-
val s = (j: jl.Iterable[String]).asScala
28+
val j = i.asJava
29+
val jc = i.asJavaCollection
30+
val s = (j: jl.Iterable[String]).asScala
3131
assert((s: c.Iterable[String]) eq i)
3232
val cs = (jc: ju.Collection[String]).asScala
3333
assert((cs: c.Iterable[String]) eq i)
3434
}
3535

3636
{
3737
val b: m.Buffer[String] = it.to(m.Buffer)
38-
val j = b.asJava
39-
val s = (j: ju.List[String]).asScala
38+
val j = b.asJava
39+
val s = (j: ju.List[String]).asScala
4040
assert((s: m.Buffer[String]) eq b)
4141
}
4242

4343
{
4444
val q: m.Seq[String] = it.to(m.Seq)
45-
val j = q.asJava
46-
val s = (j: ju.List[String]).asScala
45+
val j = q.asJava
46+
val s = (j: ju.List[String]).asScala
4747
assert((s: m.Buffer[String]) == q) // not eq
4848
}
4949

5050
{
5151
val q: c.Seq[String] = it.to(c.Seq)
52-
val j = q.asJava
53-
val s = (j: ju.List[String]).asScala
52+
val j = q.asJava
53+
val s = (j: ju.List[String]).asScala
5454
assert((s: m.Buffer[String]) == q) // not eq
5555
}
5656

5757
{
5858
val t: m.Set[String] = it.to(m.Set)
59-
val j = t.asJava
60-
val s = (j: ju.Set[String]).asScala
59+
val j = t.asJava
60+
val s = (j: ju.Set[String]).asScala
6161
assert((s: m.Set[String]) eq t)
6262
}
6363

6464
{
6565
val t: c.Set[String] = it.to(c.Set)
66-
val j = t.asJava
67-
val s = (j: ju.Set[String]).asScala
66+
val j = t.asJava
67+
val s = (j: ju.Set[String]).asScala
6868
assert((s: m.Set[String]) == t) // not eq
6969
}
7070

7171
{
7272
val p: m.Map[String, String] = m.Map(it.map(a => (a, a)).toSeq: _*)
73-
val j = p.asJava
74-
val jd = p.asJavaDictionary
75-
val s = (j: ju.Map[String, String]).asScala
73+
val j = p.asJava
74+
val jd = p.asJavaDictionary
75+
val s = (j: ju.Map[String, String]).asScala
7676
assert((s: m.Map[String, String]) eq p)
7777
val ds = (jd: ju.Dictionary[String, String]).asScala
7878
assert((ds: m.Map[String, String]) eq p)
7979
}
8080

8181
{
8282
val p: c.Map[String, String] = c.Map(it.map(a => (a, a)).toSeq: _*)
83-
val j = p.asJava
84-
val s = (j: ju.Map[String, String]).asScala
83+
val j = p.asJava
84+
val s = (j: ju.Map[String, String]).asScala
8585
assert((s: m.Map[String, String]) == p) // not eq
8686
}
8787

‎compat/src/test/scala/test/scala/collection/BuildFromTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,6 @@ class BuildFromTest {
162162
// Implement BuildFrom
163163
class MyBuildFrom[From, A, C] extends BuildFrom[From, A, C] {
164164
def fromSpecific(from: From)(it: IterableOnce[A]): C = ???
165-
def newBuilder(from: From): Builder[A, C] = ???
165+
def newBuilder(from: From): Builder[A, C] = ???
166166
}
167167
}

‎compat/src/test/scala/test/scala/collection/ViewTest.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class ViewTest {
2121

2222
@Test
2323
def mapValues: Unit = {
24-
val m = Map("a" -> 1, "b" -> 2, "c" -> 3)
25-
val oldStyle = m.mapValues(x => x*x)
26-
val newStyle = m.view.mapValues(x => x*x)
24+
val m = Map("a" -> 1, "b" -> 2, "c" -> 3)
25+
val oldStyle = m.mapValues(x => x * x)
26+
val newStyle = m.view.mapValues(x => x * x)
2727
assertEquals(oldStyle.toMap, newStyle.toMap)
2828
}
2929

‎project/plugins.sbt‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
1+
val crossVer = "0.6.1"
2+
val scalaJSVersion =
3+
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28")
4+
val scalaNativeVersion =
5+
Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9")
26

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
4-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
5-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
6-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.5")
7-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
8-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
9-
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.2.0")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
8+
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % crossVer)
9+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
10+
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % crossVer)
11+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
12+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")
13+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.5")
14+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
15+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
16+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.2.0")

0 commit comments

Comments
 (0)