Skip to content

Commit 016f3d7

Browse files
committed
Dependency upgrades
1 parent e5c3470 commit 016f3d7

File tree

8 files changed

+33
-58
lines changed

8 files changed

+33
-58
lines changed

build.sbt

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
name := "udash-jquery"
44

55
inThisBuild(Seq(
6-
version := "3.0.2",
6+
version := "3.0.3",
77
organization := "io.udash",
88
))
99

@@ -50,46 +50,11 @@ lazy val root = project.in(file("."))
5050
commonJSSettings,
5151

5252
libraryDependencies ++= Seq(
53-
"org.scala-js" %%% "scalajs-dom" % "0.9.7",
54-
"org.scalatest" %%% "scalatest" % "3.0.8" % Test,
55-
"com.lihaoyi" %%% "scalatags" % "0.7.0" % Test
53+
"org.scala-js" %%% "scalajs-dom" % "0.9.8",
54+
"org.scalatest" %%% "scalatest" % "3.1.1" % Test,
55+
"com.lihaoyi" %%% "scalatags" % "0.8.6" % Test
5656
),
5757

5858
Compile / npmDependencies += "jquery" -> "3.3.1",
5959
Test / requireJsDomEnv := true
6060
)
61-
62-
// Deployment configuration
63-
publishMavenStyle := true
64-
publishArtifact in Test := false
65-
pomIncludeRepository := { _ => false }
66-
67-
publishTo := {
68-
val nexus = "https://oss.sonatype.org/"
69-
if (isSnapshot.value)
70-
Some("snapshots" at nexus + "content/repositories/snapshots")
71-
else
72-
Some("releases" at nexus + "service/local/staging/deploy/maven2")
73-
}
74-
75-
pomExtra := {
76-
<url>https://github.com/UdashFramework/scala-js-jquery</url>
77-
<licenses>
78-
<license>
79-
<name>Apache v.2 License</name>
80-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
81-
<distribution>repo</distribution>
82-
</license>
83-
</licenses>
84-
<scm>
85-
<url>git@github.com:UdashFramework/scala-js-jquery.git</url>
86-
<connection>scm:git@github.com:UdashFramework/scala-js-jquery.git</connection>
87-
</scm>
88-
<developers>
89-
<developer>
90-
<id>avsystem</id>
91-
<name>AVSystem</name>
92-
<url>http://www.avsystem.com/</url>
93-
</developer>
94-
</developers>
95-
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# suppress inspection "UnusedProperty"
2-
sbt.version=1.3.2
2+
sbt.version=1.3.8

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ logLevel := Level.Warn
22

33
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.3.0"
44

5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.29")
6-
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.15.0-0.6")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
6+
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler-sjs06" % "0.17.0")
77

88
// Deployment configuration
9-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0-M2")
10-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.4")
9+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
10+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")

src/test/scala/io/udash/wrappers/jquery_test/DomManipulationTest.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.udash.wrappers.jquery_test
22

3-
import org.scalatest.{Matchers, WordSpec}
3+
import org.scalatest.matchers.should.Matchers
4+
import org.scalatest.wordspec.AnyWordSpec
5+
6+
class DomManipulationTest extends AnyWordSpec with Matchers {
47

5-
class DomManipulationTest extends WordSpec with Matchers {
68
import io.udash.wrappers.jquery._
79
import scalatags.JsDom.all._
810

src/test/scala/io/udash/wrappers/jquery_test/EventsHandlingTest.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
package io.udash.wrappers.jquery_test
2+
13
import org.scalajs.dom.Element
24
import org.scalajs.dom.html.Input
3-
import org.scalatest.{Matchers, WordSpec}
5+
import org.scalatest.matchers.should.Matchers
6+
import org.scalatest.wordspec.AnyWordSpec
47

5-
class EventsHandlingTest extends WordSpec with Matchers {
6-
import io.udash.wrappers.jquery._
8+
class EventsHandlingTest extends AnyWordSpec with Matchers {
79

10+
import io.udash.wrappers.jquery._
811
import scalatags.JsDom.all._
912

1013
class C(i: Int)

src/test/scala/io/udash/wrappers/jquery_test/MiscellaneousTest.scala

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package io.udash.wrappers.jquery_test
22

3-
import org.scalatest.{Matchers, WordSpec}
3+
import org.scalatest.matchers.should.Matchers
4+
import org.scalatest.wordspec.AnyWordSpec
45

5-
class MiscellaneousTest extends WordSpec with Matchers {
6-
import io.udash.wrappers.jquery._
6+
class MiscellaneousTest extends AnyWordSpec with Matchers {
77

8+
import io.udash.wrappers.jquery._
89
import scalatags.JsDom.all._
910

1011
class C(i: Int)
@@ -45,7 +46,8 @@ class MiscellaneousTest extends WordSpec with Matchers {
4546
}
4647

4748
"serialize objects to URL query string" in {
48-
import scala.scalajs.js, js.JSConverters._
49+
import scala.scalajs.js
50+
import js.JSConverters._
4951
jQ.param(js.Dynamic.literal("a" -> Seq(1, 2, 3).toJSArray, "b" -> "c")) should be("a%5B%5D=1&a%5B%5D=2&a%5B%5D=3&b=c")
5052
}
5153
}

src/test/scala/io/udash/wrappers/jquery_test/SelectorsTest.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.udash.wrappers.jquery_test
22

3-
import org.scalatest.{Matchers, WordSpec}
3+
import org.scalatest.matchers.should.Matchers
4+
import org.scalatest.wordspec.AnyWordSpec
5+
6+
class SelectorsTest extends AnyWordSpec with Matchers {
47

5-
class SelectorsTest extends WordSpec with Matchers {
68
import io.udash.wrappers.jquery._
79
import scalatags.JsDom.all._
810

src/test/scala/io/udash/wrappers/jquery_test/TraversingTest.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package io.udash.wrappers.jquery_test
22

3-
import org.scalatest.{Matchers, WordSpec}
3+
import org.scalatest.matchers.should.Matchers
4+
import org.scalatest.wordspec.AnyWordSpec
45

5-
class TraversingTest extends WordSpec with Matchers {
6-
import io.udash.wrappers.jquery._
6+
class TraversingTest extends AnyWordSpec with Matchers {
77

8+
import io.udash.wrappers.jquery._
89
import scalatags.JsDom.all._
910

1011
"jQuery" should {

0 commit comments

Comments
 (0)