Skip to content
This repository was archived by the owner on Apr 11, 2022. 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
target
node_modules/
package-lock.json

# Intellij
.idea
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
organization := "com.typesafe"
name := "npm"

scalaVersion := "2.10.6"
crossScalaVersions := Seq(scalaVersion.value, "2.11.11", "2.12.3")
scalaVersion := "2.10.7"
crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.7")

libraryDependencies ++= {
val akkaVersion = scalaBinaryVersion.value match {
case "2.10" => "2.3.16"
case "2.11" => "2.3.16"
case "2.12" => "2.5.4"
case "2.12" => "2.5.18"
}
Seq(
"com.typesafe" %% "jse" % "1.2.3",
"org.webjars" % "npm" % "4.2.0",
"org.webjars" % "npm" % "5.0.0-2",
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
"org.webjars" % "webjars-locator-core" % "0.35",
"org.webjars" % "webjars-locator-core" % "0.36",
"commons-io" % "commons-io" % "2.6" % "test",
"org.specs2" %% "specs2-core" % "3.8.8" % "test",
"org.specs2" %% "specs2-core" % "3.10.0" % "test",
"junit" % "junit" % "4.12" % "test"
)
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "somename",
"version": "1.0.0",
"dependencies": {
"amdefine": "0.1.0",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might have actually left these as they were since they were since they were just used for tests. IIRC, aerospike was chosen to test a native code integration. I'm not really familiar with that library but hopefully upgrading it doesn't change whether it uses native code or not so that we're still actually testing that functionality

"aerospike": "^2.5.1"
"aerospike": "^3.7.2",
"amdefine": "^1.0.1"
}
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.16
sbt.version=0.13.17
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.1.0")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
3 changes: 1 addition & 2 deletions src/test/scala/com/typesafe/npm/NpmSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ import com.typesafe.jse._
import java.io.File
import org.apache.commons.io.FileUtils
import org.specs2.mutable.Specification
import org.specs2.time.NoTimeConversions
import scala.concurrent.Await
import scala.concurrent.duration._

class NpmSpec extends Specification with NoTimeConversions {
class NpmSpec extends Specification {

def withEngine[T](block: ActorRef => T): T = {
val system = ActorSystem("test-system", classLoader = Some(this.getClass.getClassLoader))
Expand Down