Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
openmole
openmole
Commits
da80d5d0
Commit
da80d5d0
authored
Nov 02, 2020
by
Romain Reuillon
Browse files
[Build] enh: update scalajs
parent
4df8aa9c
Pipeline
#787
passed with stages
in 19 minutes and 25 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
libraries/build.sbt
View file @
da80d5d0
...
...
@@ -169,8 +169,8 @@ lazy val scalajsLinker = OsgiProject(dir, "scalajs-linker", exports = Seq("org.s
//
lazy
val
scalajsLogging
=
OsgiProject
(
dir
,
"scalajs-logging"
,
exports
=
Seq
(
"org.scalajs.logging.*"
))
settings
(
libraryDependencies
+=
"org.scala-js"
%%
"scalajs-logging"
%
scalajsVersion
,
version
:=
scalajsVersion
)
settings
(
settings
:
_
*
)
libraryDependencies
+=
"org.scala-js"
%%
"scalajs-logging"
%
scalajs
Logging
Version
,
version
:=
scalajs
Logging
Version
)
settings
(
settings
:
_
*
)
lazy
val
scalaJS
=
OsgiProject
(
dir
,
"scalajs"
,
exports
=
Seq
(
"scala.scalajs.*"
),
imports
=
Seq
(
"*"
))
settings
(
libraryDependencies
+=
"org.scala-js"
%%
"scalajs-library"
%
scalajsVersion
,
...
...
libraries/project/plugins.sbt
View file @
da80d5d0
addSbtPlugin
(
"org.openmole"
%
"openmole-buildsystem-plugin"
%
"1.8-SNAPSHOT"
)
addSbtPlugin
(
"org.scala-js"
%
"sbt-scalajs"
%
"1.
1
.0"
)
addSbtPlugin
(
"org.scala-js"
%
"sbt-scalajs"
%
"1.
3
.0"
)
openmole/project/Libraries.scala
View file @
da80d5d0
...
...
@@ -69,7 +69,7 @@ object Libraries {
lazy
val
json4s
=
"org.openmole.library"
%%
"org-json4s"
%
json4sVersion
lazy
val
circe
=
"org.openmole.library"
%%
"io-circe"
%
circeVersion
lazy
val
scalajsLinker
=
"org.openmole.library"
%%
"scalajs-linker"
%
scalajsVersion
lazy
val
scalajsLogging
=
"org.openmole.library"
%%
"scalajs-logging"
%
scalajsVersion
lazy
val
scalajsLogging
=
"org.openmole.library"
%%
"scalajs-logging"
%
scalajs
Logging
Version
lazy
val
scalaCompat
=
"org.openmole.library"
%%
"scala-collection-compat"
%
"2.1.4"
lazy
val
scalajs
=
"org.openmole.library"
%%
"scalajs"
%
scalajsVersion
lazy
val
mgo
=
"org.openmole.library"
%%
"mgo"
%
mgoVersion
...
...
openmole/project/common.scala
View file @
da80d5d0
...
...
@@ -12,7 +12,6 @@ object common {
def
netLogo5Version
=
"5.3.1"
def
netLogo6Version
=
"6.1.1"
def
scalaTagsVersion
=
"0.9.1"
def
scalaJSDomVersion
=
"1.0.0"
def
rxVersion
=
"0.4.3"
def
boopickleVersion
=
"1.3.3"
def
scalaAutowireVersion
=
"0.3.2"
...
...
@@ -22,7 +21,6 @@ object common {
def
json4sVersion
=
"3.6.7"
def
circeVersion
=
"0.13.0"
def
catsVersion
=
"2.1.0"
def
scalajsVersion
=
"1.1.0"
def
squantsVersion
=
"1.6.0"
def
xstreamVersion
=
"1.4.12"
def
scalaURIVersion
=
"1.1.1"
...
...
@@ -38,6 +36,10 @@ object common {
def
mathVersion
=
"3.6.1"
def
asmVersion
=
"7.2"
def
scalajsVersion
=
"1.3.0"
def
scalajsLoggingVersion
=
"1.1.0"
def
scalaJSDomVersion
=
"1.0.0"
def
scalatraVersion
=
"2.7.0"
def
jettyVersion
=
"9.4.28.v20200408"
...
...
openmole/project/plugins.sbt
View file @
da80d5d0
...
...
@@ -4,7 +4,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
addSbtPlugin
(
"org.openmole"
%
"openmole-buildsystem-plugin"
%
"1.8-SNAPSHOT"
)
addSbtPlugin
(
"org.scala-js"
%
"sbt-scalajs"
%
"1.
1
.0"
)
addSbtPlugin
(
"org.scala-js"
%
"sbt-scalajs"
%
"1.
3
.0"
)
addSbtPlugin
(
"org.openmole"
%
"scalajs-execnpm"
%
"0.10"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment