From 13a193f7bb3e13529045ea2947b59a8505c0575f Mon Sep 17 00:00:00 2001 From: Denis Borisenko Date: Thu, 10 Jan 2019 16:23:40 +0100 Subject: [PATCH 1/2] Dependency upgrade of everything what was possible to upgrade --- README.md | 28 +++++++++---------- .../generator/sui/SuiTypeMapperFunction.scala | 1 + project/Dependencies.scala | 14 +++++----- project/build.properties | 2 +- project/plugins.sbt | 4 +-- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 6c71abad..b205171c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ scalajs-react-components [![Build Status](https://travis-ci.org/dborisenko/scalajs-react-components.svg?branch=master)](https://travis-ci.org/dborisenko/scalajs-react-components) [![License](https://img.shields.io/github/license/dborisenko/scalajs-react-components.svg)](LICENSE) [![scalajs-react](https://img.shields.io/badge/scalajs--react-1.3.1-blue.svg)](https://github.com/japgolly/scalajs-react) -[![react](https://img.shields.io/badge/react-16.6.1-blue.svg)](https://reactjs.org) +[![react](https://img.shields.io/badge/react-16.7.0-blue.svg)](https://reactjs.org) Reusable [scalajs-react](https://github.com/japgolly/scalajs-react) components. @@ -17,7 +17,7 @@ Adding types to javascript is a lot of guesswork, and we're certain to have gott # Semantic UI [![Maven Central](https://img.shields.io/maven-central/v/com.dbrsn.scalajs.react.components/semantic-ui-react_sjs0.6_2.12.svg)](https://maven-badges.herokuapp.com/maven-central/com.dbrsn.scalajs.react.components/semantic-ui-react_sjs0.6_2.12) -[![react](https://img.shields.io/badge/semantic--ui--react-0.83.0-blue.svg)](https://www.npmjs.com/package/semantic-ui-react) +[![react](https://img.shields.io/badge/semantic--ui--react-0.84.0-blue.svg)](https://www.npmjs.com/package/semantic-ui-react) Module `semantic-ui-react` contains scalajs wrapper for [semantic-ui-react](https://react.semantic-ui.com) component. @@ -28,9 +28,9 @@ libraryDependencies ++= Seq( "com.dbrsn.scalajs.react.components" %%% "semantic-ui-react" % "0.0.8" ) npmDependencies in Compile ++= Seq( - "semantic-ui-react" -> "0.83.0", - "react" -> "16.6.1", - "react-dom" -> "16.6.1" + "semantic-ui-react" -> "0.84.0", + "react" -> "16.7.0", + "react-dom" -> "16.7.0" ) ``` @@ -45,7 +45,7 @@ SuiButton(animated = true, onClick = (_: ReactMouseEventFromHtml) => Callback(?? # React Sortable (HOC) [![Maven Central](https://img.shields.io/maven-central/v/com.dbrsn.scalajs.react.components/react-sortable-hoc_sjs0.6_2.12.svg)](https://maven-badges.herokuapp.com/maven-central/com.dbrsn.scalajs.react.components/react-sortable-hoc_sjs0.6_2.12) -[![react](https://img.shields.io/badge/react--sortable--hoc-0.8.3-blue.svg)](https://www.npmjs.com/package/react-sortable-hoc) +[![react](https://img.shields.io/badge/react--sortable--hoc-1.4.0-blue.svg)](https://www.npmjs.com/package/react-sortable-hoc) Module `react-sortable-hoc` contains scalajs wrapper for [react-sortable-hoc](https://github.com/clauderic/react-sortable-hoc) component. @@ -56,9 +56,9 @@ libraryDependencies ++= Seq( "com.dbrsn.scalajs.react.components" %%% "react-sortable-hoc" % "0.0.8" ) npmDependencies in Compile ++= Seq( - "react-sortable-hoc" -> "0.8.3", - "react" -> "16.6.1", - "react-dom" -> "16.6.1" + "react-sortable-hoc" -> "1.4.0", + "react" -> "16.7.0", + "react-dom" -> "16.7.0" ) ``` @@ -81,7 +81,7 @@ SortableList[Model, Props].Props( # react-trello [![Maven Central](https://img.shields.io/maven-central/v/com.dbrsn.scalajs.react.components/react-trello_sjs0.6_2.12.svg)](https://maven-badges.herokuapp.com/maven-central/com.dbrsn.scalajs.react.components/react-trello_sjs0.6_2.12) -[![react](https://img.shields.io/badge/react--trello-2.0.4-blue.svg)](https://www.npmjs.com/package/react-trello) +[![react](https://img.shields.io/badge/react--trello-2.0.8-blue.svg)](https://www.npmjs.com/package/react-trello) Module `react-trello` contains scalajs wrapper for [react-trello](https://www.npmjs.com/package/react-trello) component. @@ -92,10 +92,10 @@ libraryDependencies ++= Seq( "com.dbrsn.scalajs.react.components" %%% "react-trello" % "0.0.8" ) npmDependencies in Compile ++= Seq( - "react-trello" -> "2.0.4", - "@babel/runtime" -> "7.1.5", - "react" -> "16.6.1", - "react-dom" -> "16.6.1" + "react-trello" -> "2.0.8", + "@babel/runtime" -> "7.2.0", + "react" -> "16.7.0", + "react-dom" -> "16.7.0" ) ``` diff --git a/generator-semantic-ui-react/src/main/scala/com/dbrsn/generator/sui/SuiTypeMapperFunction.scala b/generator-semantic-ui-react/src/main/scala/com/dbrsn/generator/sui/SuiTypeMapperFunction.scala index 59654796..d8f3a701 100644 --- a/generator-semantic-ui-react/src/main/scala/com/dbrsn/generator/sui/SuiTypeMapperFunction.scala +++ b/generator-semantic-ui-react/src/main/scala/com/dbrsn/generator/sui/SuiTypeMapperFunction.scala @@ -15,6 +15,7 @@ object SuiTypeMapperFunction { case ("Checkbox", "onChange") => "ReactEventFromInput => Callback" case ("Checkbox", "onClick") => "ReactMouseEventFromInput => Callback" case ("Checkbox", "onMouseDown") => "ReactMouseEventFromInput => Callback" + case ("Checkbox", "onMouseUp") => "ReactMouseEventFromInput => Callback" case ("Confirm", "onCancel") => "ReactMouseEventFromHtml => Callback" case ("Confirm", "onConfirm") => "ReactMouseEventFromHtml => Callback" case ("DropdownItem", "onClick") => "ReactMouseEventFromHtml => Callback" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 559880d9..93be5e4d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ object Dependencies extends DependencyBuilders { type NpmDependency = (String, String) object Versions { - lazy val scala = "2.12.7" + lazy val scala = "2.12.8" lazy val webpack = "2.6.1" @@ -19,14 +19,14 @@ object Dependencies extends DependencyBuilders { // Scala: JVM + JS libraries lazy val scalatest = "3.0.5" - lazy val specs2 = "4.3.5" + lazy val specs2 = "4.3.6" // JavaScript: Node.js libraries - lazy val `semantic-ui-react` = "0.83.0" - lazy val react = "16.6.1" - lazy val `react-sortable-hoc` = "0.8.3" - lazy val `react-trello` = "2.0.4" - lazy val `babel-runtime` = "7.1.5" + lazy val react = "16.7.0" + lazy val `semantic-ui-react` = "0.84.0" + lazy val `react-sortable-hoc` = "1.4.0" + lazy val `react-trello` = "2.0.8" + lazy val `babel-runtime` = "7.2.0" } // Scala: JVM libraries diff --git a/project/build.properties b/project/build.properties index 6d441921..c0bab049 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.4 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 363f537a..f33cc4e7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ // Scala.js, the Scala to JavaScript compiler -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26") // Module bundler for Scala.js projects that use NPM packages addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.13.1") @@ -17,7 +17,7 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.3.7") // A release plugin for sbt -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.9") +addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11") // A sbt plugin for publishing Scala/Java projects to the Maven central addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") From 259952ae7379957eb2980bc2c5b05d4803653365 Mon Sep 17 00:00:00 2001 From: Denis Borisenko Date: Thu, 10 Jan 2019 16:27:54 +0100 Subject: [PATCH 2/2] Updated travis-ci scala version to v2.12.8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6bbbde95..eb0f9b8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: scala scala: - - 2.12.7 + - 2.12.8 jdk: - oraclejdk8