Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
mcesar committed Jul 9, 2023
1 parent 8670681 commit 0aafcf9
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 19 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
target
.idea
.bloop
.bsp
.metals
.vscode
metals.sbt
3 changes: 0 additions & 3 deletions .jvmopts
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
-Dfile.encoding=UTF8
-XX:MaxPermSize=512m
-Xms1g
-Xmx2g
-Xss2m
-XX:+CMSClassUnloadingEnabled
-XX:+UseConcMarkSweepGC
16 changes: 8 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@ scalacOptions ++= Seq("-deprecation", "-feature")


libraryDependencies ++= Seq(
"org.webjars.npm" % "react" % "16.13.1",
"org.webjars.npm" % "react" % "18.2.0",
"org.webjars.npm" % "react-tools" % "0.13.3",
"org.webjars.npm" % "js-tokens" % "4.0.0",
"org.webjars.npm" % "js-tokens" % "8.0.0",
"org.webjars.npm" % "jstransform" % "11.0.3",
"org.webjars" % "esprima" % "13001.1.0-dev-harmony-fb",
"org.webjars" % "base62js" % "1.0.0",
"org.webjars.npm" % "source-map" % "0.7.3",
"org.webjars.npm" % "source-map" % "0.7.4",
"org.webjars" % "mkdirp" % "0.5.0",
"org.webjars.npm" % "minimatch" % "3.0.4"
"org.webjars.npm" % "minimatch" % "5.1.6"
)

addSbtJsEngine("1.2.3")

licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0.html"))

ThisBuild / crossScalaVersions := Seq("2.12.11", "2.10.7")
ThisBuild / crossScalaVersions := Seq("2.12.18", "2.10.7")
ThisBuild / pluginCrossBuild / sbtVersion := {
scalaBinaryVersion.value match {
case "2.10" => "0.13.18"
case "2.12" => "1.2.8"
case "2.12" => "1.9.1"
}
}

Expand All @@ -40,5 +40,5 @@ pomIncludeRepository := { _ => false }
publishMavenStyle := false

// Bintray settings
bintrayRepository in bintray := "sbt-plugins"
bintrayOrganization in bintray := None
bintray / bintrayRepository := "sbt-plugins"
bintray / bintrayOrganization := None
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.9.1
8 changes: 4 additions & 4 deletions src/main/scala/com/github/ddispaltro/reactjs/SbtReactJs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ object SbtReactJs extends AutoPlugin {
inConfig(Assets)(reactJsScriptUnscopedSettings) ++
inConfig(TestAssets)(reactJsScriptUnscopedSettings) ++
Seq(
taskMessage in Assets := "ReactJS compiling",
taskMessage in TestAssets := "ReactJS test compiling"
Assets / taskMessage := "ReactJS compiling",
TestAssets / taskMessage := "ReactJS test compiling"
)
) ++ SbtJsTask.addJsSourceFileTasks(reactJs) ++ Seq(
reactJs in Assets := (reactJs in Assets).dependsOn(webModules in Assets, nodeModules in Assets).value,
reactJs in TestAssets := (reactJs in TestAssets).dependsOn(webModules in TestAssets, nodeModules in TestAssets).value
Assets / reactJs := (Assets / reactJs).dependsOn(Assets / webModules, Assets / nodeModules).value,
TestAssets / reactJs := (TestAssets / reactJs).dependsOn(TestAssets / webModules, TestAssets / nodeModules).value
)


Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.9.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.9.1
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.6.9-SNAPSHOT"
ThisBuild / version := "0.6.9-SNAPSHOT"

0 comments on commit 0aafcf9

Please sign in to comment.