Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gate
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openmole
gate
Commits
06b795de
Commit
06b795de
authored
Oct 15, 2017
by
Mathieu leclaire
Committed by
GitHub
Oct 15, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7 from swoogles/master
Upgrade all libs for Scala 2.12
parents
33f50a64
93d6a491
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
build.sbt
build.sbt
+10
-10
build.sbt
project/build.sbt
+1
-1
No files found.
build.sbt
View file @
06b795de
...
...
@@ -5,17 +5,17 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
val
Organization
=
"fr.iscpif"
val
Name
=
"ScalaWUI"
val
Version
=
"0.1.0-SNAPSHOT"
val
ScalaVersion
=
"2.1
1.8
"
val
scalatraVersion
=
"2.5.
0
"
val
jettyVersion
=
"9.
2.19.v20160908
"
val
json4sVersion
=
"3.
3.0
"
val
scalatagsVersion
=
"0.6.
3
"
val
ScalaVersion
=
"2.1
2.3
"
val
scalatraVersion
=
"2.5.
1
"
val
jettyVersion
=
"9.
4.6.v20170531
"
val
json4sVersion
=
"3.
5.2
"
val
scalatagsVersion
=
"0.6.
5
"
val
autowireVersion
=
"0.2.6"
val
upickleVersion
=
"0.4.
1
"
val
rxVersion
=
"0.3.
1
"
val
upickleVersion
=
"0.4.
4
"
val
rxVersion
=
"0.3.
2
"
val
scaladgetVersion
=
"0.9.4"
val
scalajsDomVersion
=
"0.9.
1
"
val
jqueryVersion
=
"
2
.2.1"
val
scalajsDomVersion
=
"0.9.
3
"
val
jqueryVersion
=
"
3
.2.1"
val
Resolvers
=
Seq
(
Resolver
.
sonatypeRepo
(
"snapshots"
),
"Typesafe repository"
at
"http://repo.typesafe.com/typesafe/releases/"
)
...
...
@@ -31,7 +31,7 @@ lazy val client = project.in(file("client")) settings(
scalaVersion
:=
ScalaVersion
,
resolvers
in
ThisBuild
++=
Resolvers
,
skip
in
packageJSDependencies
:=
false
,
jsDependencies
+=
"org.webjars"
%
"d3js"
%
"
3.5.12
"
/
"d3.min.js"
,
jsDependencies
+=
"org.webjars"
%
"d3js"
%
"
4.2.1
"
/
"d3.min.js"
,
libraryDependencies
++=
Seq
(
"com.lihaoyi"
%%%
"autowire"
%
autowireVersion
,
"com.lihaoyi"
%%%
"upickle"
%
upickleVersion
,
...
...
project/build.sbt
View file @
06b795de
...
...
@@ -4,4 +4,4 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
addSbtPlugin
(
"org.scalatra.sbt"
%
"scalatra-sbt"
%
"0.5.1"
)
addSbtPlugin
(
"org.scala-js"
%
"sbt-scalajs"
%
"0.6.1
4
"
)
addSbtPlugin
(
"org.scala-js"
%
"sbt-scalajs"
%
"0.6.1
8
"
)
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