Skip to content

Conversation

OndrejSpanel
Copy link

All steps updated to recent tooling versions (still using Scala 2)

Someone with access rights has to copy the branch together with its history here and perhaps delete all the old branches as they seem useless now.

@gzm0
Copy link
Contributor

gzm0 commented Mar 24, 2024

 git range-diff 1.x~7..1.x refs/pull/19/head~7..refs/pull/19/head
1:  b35bbf6 ! 1:  a8b7934 Step 1: Setup
    @@ build.sbt (new)
     +enablePlugins(ScalaJSPlugin)
     +
     +name := "Scala.js Tutorial"
    -+scalaVersion := "2.13.6"
    ++scalaVersion := "2.13.13"
     +
     +// This is an application with a main method
     +scalaJSUseMainModuleInitializer := true
     
      ## project/build.properties (new) ##
     @@
    -+sbt.version=1.5.5
    ++sbt.version=1.9.9
     
      ## project/plugins.sbt (new) ##
     @@
    -+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
    ++addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
     
      ## src/main/scala/tutorial/webapp/TutorialApp.scala (new) ##
     @@
2:  0ec7ca1 = 2:  916f152 Step 2: Integrating with HTML
3:  d55ab22 ! 3:  b6470bb Step 3: Using the DOM
    @@ Commit message
         Step 3: Using the DOM
     
      ## build.sbt ##
    -@@ build.sbt: scalaVersion := "2.13.6"
    +@@ build.sbt: scalaVersion := "2.13.13"
      
      // This is an application with a main method
      scalaJSUseMainModuleInitializer := true
     +
    -+libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.2.0"
    ++libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.8.0"
     
      ## src/main/scala/tutorial/webapp/TutorialApp.scala ##
     @@
4:  932cbe9 = 4:  ffbe911 Step 4: Reacting on User Input
5:  362f8f2 = 5:  39a4c2b Step 5: Setup the UI in Scala.js
6:  bda00b3 ! 6:  11cea4e Step 6: Testing
    @@ Commit message
         Step 6: Testing
     
      ## build.sbt ##
    -@@ build.sbt: scalaVersion := "2.13.6"
    +@@ build.sbt: scalaVersion := "2.13.13"
      scalaJSUseMainModuleInitializer := true
      
    - libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.2.0"
    + libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.8.0"
     +
     +// Add support for the DOM in `run` and `test`
     +jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv()
     +
     +// uTest settings
    -+libraryDependencies += "com.lihaoyi" %%% "utest" % "0.7.9" % "test"
    ++libraryDependencies += "com.lihaoyi" %%% "utest" % "0.8.2" % "test"
     +testFrameworks += new TestFramework("utest.runner.Framework")
     
      ## project/plugins.sbt ##
     @@
    - addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
    + addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
     +
     +libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0"
     
7:  979370a = 7:  88c4bdb Step 7: Optimizing for Production

LGTM

@gzm0 gzm0 merged commit 88c4bdb into scala-js:1.x Mar 24, 2024
@gzm0
Copy link
Contributor

gzm0 commented Mar 24, 2024

I have moved the current 1.x. to 1.7.x and reset 1.x to this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants