diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3934e24..3fb3db0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ jobs: matrix: include: - java: 16 - scala: 2 - - java: 8 scala: 3 + - java: 8 + scala: 2 steps: - name: Git checkout diff --git a/.gitignore b/.gitignore index ab7bdcc5..b1d764b4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ doc/_book project/sjsincoptbench.sbt project/metals.sbt .bsp +/package-lock.json diff --git a/build.sbt b/build.sbt index 38ca004a..a5b54ad2 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "ScalaCSS" ThisBuild / homepage := Some(url("https://github.com/japgolly/scalacss")) ThisBuild / licenses += ("Apache-2.0", url("http://opensource.org/licenses/Apache-2.0")) -ThisBuild / organization := "com.github.japgolly.scalacss" +ThisBuild / organization := "com.github.gmixa.scalacss" ThisBuild / shellPrompt := ((s: State) => Project.extract(s).currentRef.project + "> ") ThisBuild / startYear := Some(2015) ThisBuild / versionScheme := Some("early-semver") diff --git a/downstream-tests/build.sbt b/downstream-tests/build.sbt index 26cfcad3..3f7edf94 100644 --- a/downstream-tests/build.sbt +++ b/downstream-tests/build.sbt @@ -111,7 +111,7 @@ lazy val js = project libraryDependencies ++= { val ver = version.value.stripSuffix("-SNAPSHOT") + "-SNAPSHOT" Seq( - "com.github.japgolly.scalacss" %%% "core" % ver, + "com.github.gmixa.scalacss" %%% "core" % ver, Dep.microlibsCompileTime.value % Test, Dep.microlibsTestUtil.value % Test, ) diff --git a/ext-scalatags/js/src/main/scala/scalacss/ScalatagsJsDom.scala b/ext-scalatags/js/src/main/scala/scalacss/ScalatagsJsDom.scala index 572921d3..054f6ba2 100644 --- a/ext-scalatags/js/src/main/scala/scalacss/ScalatagsJsDom.scala +++ b/ext-scalatags/js/src/main/scala/scalacss/ScalatagsJsDom.scala @@ -20,5 +20,5 @@ trait ScalatagsJsDomImplicits { class ScalatagsJsDomRenderer(s: Renderer[String]) extends Renderer[TypedTag[HTMLStyleElement]] { override def apply(css: Css) = - tags2.style(`type` := "text/css", s(css)) + tags2.style(`type` := "text/css", s(css)).asInstanceOf[TypedTag[HTMLStyleElement]] } diff --git a/misc/build.sbt b/misc/build.sbt index 45bcb276..ae813185 100644 --- a/misc/build.sbt +++ b/misc/build.sbt @@ -1,7 +1,7 @@ -scalaVersion := "2.12.4" +scalaVersion := "2.12.19" -libraryDependencies += "io.argonaut" %% "argonaut-scalaz" % "6.2" -libraryDependencies += "org.scalaz" %% "scalaz-core" % "7.2.18" +libraryDependencies += "io.argonaut" %% "argonaut-scalaz" % "6.3.10" +libraryDependencies += "org.scalaz" %% "scalaz-core" % "7.3.8" scalacOptions ++= Seq( "-unchecked", "-deprecation", diff --git a/misc/experiment/build.sbt b/misc/experiment/build.sbt index 6ad5d014..7b30af23 100644 --- a/misc/experiment/build.sbt +++ b/misc/experiment/build.sbt @@ -1,8 +1,8 @@ -scalaVersion := "2.11.6" +scalaVersion := "2.13.14" -libraryDependencies += "org.scalaz" %% "scalaz-effect" % "7.1.1" +libraryDependencies += "org.scalaz" %% "scalaz-effect" % "7.3.8" -libraryDependencies += "com.chuusai" %% "shapeless" % "2.1.0" +libraryDependencies += "com.chuusai" %% "shapeless" % "2.3.12" scalacOptions ++= Seq( "-unchecked", "-deprecation", diff --git a/misc/experiment/project/plugins.sbt b/misc/experiment/project/plugins.sbt new file mode 100644 index 00000000..0fb7b68c --- /dev/null +++ b/misc/experiment/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") \ No newline at end of file diff --git a/misc/project/build.properties b/misc/project/build.properties index 8b697bbb..ee4c672c 100644 --- a/misc/project/build.properties +++ b/misc/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.0 +sbt.version=1.10.1 diff --git a/project/Build.scala b/project/Build.scala index c2389a3a..42c3ed29 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -111,7 +111,6 @@ object ScalaCssBuild { Dep.cats.value % Test, ), ) - .configure(onlyScala2) lazy val extReact = project .in(file("ext-react")) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ccc0d1e1..5d0adddf 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,19 +9,19 @@ object Dependencies { object Ver { // Exported - val scala2 = "2.13.6" - val scala3 = "3.0.1" - val scalaJsDom = "2.0.0" - val scalaJsReact = "2.0.0" - val scalatags = "0.10.0" - val univEq = "2.0.0" + val scala2 = "2.13.14" + val scala3 = "3.4.2" + val scalaJsDom = "2.8.0" + val scalaJsReact = "2.1.2" + val scalatags = "0.13.1" + val univEq = "2.0.1" // Internal - val cats = "2.6.1" - val microlibs = "4.0.0" - val nyaya = "1.0.0" - val reactJs = "17.0.2" - val utest = "0.7.10" + val cats = "2.12.0" + val microlibs = "4.2.1" + val nyaya = "1.1.0" + val reactJs = "17.0.1" + val utest = "0.8.3" } object Dep { @@ -38,7 +38,7 @@ object Dependencies { val scalaJsReactDummy = Def.setting("com.github.japgolly.scalajs-react" %%% "util-dummy-defaults" % Ver.scalaJsReact) val scalaJsReactTest = Def.setting("com.github.japgolly.scalajs-react" %%% "test" % Ver.scalaJsReact) val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value) - val scalatags = Def.setting("com.lihaoyi" %%% "scalatags" % Ver.scalatags cross CrossVersion.for3Use2_13) + val scalatags = Def.setting("com.lihaoyi" %%% "scalatags" % Ver.scalatags) val univEq = Def.setting("com.github.japgolly.univeq" %%% "univeq" % Ver.univEq) val utest = Def.setting("com.lihaoyi" %%% "utest" % Ver.utest) } diff --git a/project/build.properties b/project/build.properties index 10fd9eee..ee4c672c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.10.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 809fbace..da3de01c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,12 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-jsdom-nodejs" % "1.1.0" -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.3.0") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.0") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") + +//addSbtPlugin("org.jmotor.sbt" % "sbt-dependency-updates" % "1.2.9") diff --git a/scalafix.sbt b/scalafix.sbt index 302b0f47..5ddbe33b 100644 --- a/scalafix.sbt +++ b/scalafix.sbt @@ -7,10 +7,10 @@ ThisBuild / scalacOptions ++= { ThisBuild / semanticdbEnabled := true -ThisBuild / semanticdbVersion := "4.4.29" +ThisBuild / semanticdbVersion := "4.9.8" ThisBuild / scalafixScalaBinaryVersion := "2.13" ThisBuild / scalafixDependencies ++= Seq( - "com.github.liancheng" %% "organize-imports" % "0.5.0" + "com.github.liancheng" %% "organize-imports" % "0.6.0" ) diff --git a/version.sbt b/version.sbt index dc11afef..67d9433f 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.0.1-SNAPSHOT" +ThisBuild / version := "1.0.1-SNAPSHOT"