Skip to content
This repository was archived by the owner on Apr 2, 2019. It is now read-only.

Commit 10bc798

Browse files
author
Starzu
committed
Version 0.3.0
1 parent 1c9fcc2 commit 10bc798

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

build.sbt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "udash-guide"
22

3-
version in ThisBuild := "0.3.0-SNAPSHOT"
3+
version in ThisBuild := "0.3.0"
44
scalaVersion in ThisBuild := versionOfScala
55
organization in ThisBuild := "io.udash"
66
scalacOptions in ThisBuild ++= Seq(
@@ -26,7 +26,7 @@ lazy val udashGuide = project.in(file("."))
2626
.dependsOn(backend)
2727
.settings(
2828
publishArtifact := false,
29-
mainClass in Compile := Some("io.udash.guide.Launcher")
29+
mainClass in Compile := Some("io.udash.web.Launcher")
3030
)
3131

3232
lazy val shared = crossProject.crossType(CrossType.Pure).in(file("shared"))
@@ -56,7 +56,7 @@ lazy val backend = project.in(file("backend"))
5656
watchSources ++= (sourceDirectory in guide).value.***.get,
5757

5858
assemblyJarName in assembly := "udash-guide.jar",
59-
mainClass in assembly := Some("io.udash.guide.Launcher"),
59+
mainClass in assembly := Some("io.udash.web.Launcher"),
6060
assemblyMergeStrategy in assembly := {
6161
case "JS_DEPENDENCIES" => MergeStrategy.concat
6262
case x =>
@@ -97,9 +97,17 @@ val commonFrontendSettings = Seq(
9797
artifactPath in(Compile, packageScalaJSLauncher) :=
9898
(target in(Compile, packageScalaJSLauncher)).value / staticFilesDir.value / "WebContent" / "scripts" / "frontend-init.js",
9999

100-
requiresDOM in Test := true,
101100
persistLauncher in Test := false,
102-
scalaJSUseRhino in Test := false
101+
scalaJSUseRhino in Test := false,
102+
scalaJSStage in Test := FastOptStage,
103+
jsDependencies in Test += RuntimeDOM % Test,
104+
jsEnv in Test := new org.scalajs.jsenv.selenium.SeleniumJSEnv(org.scalajs.jsenv.selenium.Firefox),
105+
106+
scalacOptions += {
107+
val localDir = (baseDirectory in ThisBuild).value.toURI.toString
108+
val githubDir = "https://raw.githubusercontent.com/UdashFramework/udash-guide"
109+
s"-P:scalajs:mapSourceURI:$localDir->$githubDir/v${version.value}/"
110+
}
103111
)
104112

105113
lazy val guide = project.in(file("guide")).enablePlugins(ScalaJSPlugin)

guide/src/main/scala/io/udash/web/guide/init.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import org.scalajs.dom.{Element, document}
1313

1414
import scala.scalajs.js.JSApp
1515
import scala.scalajs.js.annotation.JSExport
16+
import scala.util.Try
1617

1718
object Context {
1819
implicit val executionContext = scalajs.concurrent.JSExecutionContext.Implicits.queue
@@ -25,7 +26,7 @@ object Context {
2526
val serverRpc = DefaultServerRPC[MainClientRPC, MainServerRPC](new RPCService)
2627

2728
import io.udash.rest._
28-
val restServer = DefaultServerREST[MainServerREST](dom.window.location.hostname, dom.window.location.port.toInt, "/rest/")
29+
val restServer = DefaultServerREST[MainServerREST](dom.window.location.hostname, Try(dom.window.location.port.toInt).getOrElse(80), "/rest/")
2930

3031
val mainMenuEntries: Seq[MenuEntry] = Seq(
3132
MenuLink("Intro", IntroState),

homepage/src/main/scala/io/udash/web/homepage/views/IndexView.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private[views] object IndexView {
122122
),
123123
li(HomepageStyles.get.moreListItem)(
124124
h2(HomepageStyles.get.moreListHead)("Generator"),
125-
p(HomepageStyles.get.moreListDescription)("Generate a customized application, compile and\u00A0try it out in a 5 minutes.")
125+
p(HomepageStyles.get.moreListDescription)("Generate a customized application, compile and\u00A0try it out in 5 minutes.")
126126
),
127127

128128
li(HomepageStyles.get.moreListItem)(
@@ -131,7 +131,7 @@ private[views] object IndexView {
131131
),
132132
li(HomepageStyles.get.moreListItem, HomepageStyles.get.moreListItemTwoLineTitle)(
133133
h2(HomepageStyles.get.moreListHead)("Backend independent"),
134-
p(HomepageStyles.get.moreListDescription)("Udash provides a complete support for your web application and the communication with the server, but makes no influence on your backend implementation.")
134+
p(HomepageStyles.get.moreListDescription)("Udash provides a complete support for your web application and the communication with the server but does not influence your backend implementation.")
135135
),
136136
li(HomepageStyles.get.moreListItem)(
137137
h2(HomepageStyles.get.moreListHead)("IDE support"),

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Dependencies extends Build {
66
val versionOfScala = "2.11.8"
77
val jettyVersion = "9.3.8.v20160314"
88

9-
val udashVersion = "0.3.0-rc.2"
9+
val udashVersion = "0.3.0"
1010
val udashJQueryVersion = "1.0.0"
1111

1212
val scalaTagsVersion = "0.5.5"

project/plugins.sbt

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

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
4-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.10")
4+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
5+
6+
libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "0.1.3"

0 commit comments

Comments
 (0)