Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ jdk:
- openjdk11

env:
- TRAVIS_NODE_VERSION="12.16.1" JOB_NAME="test"
global:
- TRAVIS_NODE_VERSION="12.16.1" JOB_NAME="test"
matrix:
- SCALAJS_VERSION="0.6.32"
- SCALAJS_VERSION="1.0.0"

script:
- sbt ++$TRAVIS_SCALA_VERSION test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class BufferTest extends AnyFunSpec {
import scala.scalajs.js.typedarray.Int8Array
val nodeBuffer = Buffer.from(js.Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9))
val typedarray = new Int8Array(nodeBuffer.buffer, nodeBuffer.byteOffset, nodeBuffer.length)
assert(typedarray.mkString === new Int8Array(js.Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)).mkString)
assert(typedarray.mkString === new Int8Array(js.Array[Byte](0, 1, 2, 3, 4, 5, 6, 7, 8, 9)).mkString)
}

it("should support byteLength for specific types") {
Expand Down
7 changes: 4 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ import sbt.Keys._
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._

object Dependencies {
val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value)
val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value)
val scalatestVersion = "3.1.1"

val core = Def.setting(
Seq(
scalaReflect.value,
"org.scalatest" %%% "scalatest" % "3.1.1" % "test"
"org.scalatest" %%% "scalatest" % scalatestVersion % "test"
)
)

val app = Def.setting(
Seq(
scalaReflect.value,
"org.scalatest" %%% "scalatest" % "3.1.1" % "test",
"org.scalatest" %%% "scalatest" % scalatestVersion % "test",
"com.thoughtworks.enableIf" %% "enableif" % "1.1.7"
)
)
Expand Down
10 changes: 7 additions & 3 deletions project/MySettings.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import org.scalajs.sbtplugin.ScalaJSPlugin.AutoImport.{ModuleKind, scalaJSModuleKind}
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
import sbt._
import sbt.Keys._
import sbtrelease.ReleasePlugin.autoImport._
Expand Down Expand Up @@ -56,8 +56,12 @@ object MySettings {
)

lazy val commonScalaJsSettings = Seq(
scalacOptions += "-P:scalajs:sjsDefinedByDefault",
scalaJSModuleKind := ModuleKind.CommonJSModule,
scalacOptions ++= Seq("-P:scalajs:sjsDefinedByDefault").filter { _ =>
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0").startsWith("0.6.")
},
scalaJSLinkerConfig ~= {
_.withModuleKind(ModuleKind.CommonJSModule)
},
logBuffered in Test := true
)

Expand Down
5 changes: 4 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
Expand Down
3 changes: 3 additions & 0 deletions script/release.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env node

console.log("AYY! !");