Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated dependencies #393

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
matrix:
include:
- java: 16
scala: 2
- java: 8
scala: 3
- java: 8
scala: 2

steps:
- name: Git checkout
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ doc/_book
project/sjsincoptbench.sbt
project/metals.sbt
.bsp
/package-lock.json
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion downstream-tests/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
}
6 changes: 3 additions & 3 deletions misc/build.sbt
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions misc/experiment/build.sbt
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
1 change: 1 addition & 0 deletions misc/experiment/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3")
2 changes: 1 addition & 1 deletion misc/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.0
sbt.version=1.10.1
1 change: 0 additions & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ object ScalaCssBuild {
Dep.cats.value % Test,
),
)
.configure(onlyScala2)

lazy val extReact = project
.in(file("ext-react"))
Expand Down
24 changes: 12 additions & 12 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.5
sbt.version=1.10.1
15 changes: 9 additions & 6 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
4 changes: 2 additions & 2 deletions scalafix.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "1.0.1-SNAPSHOT"
ThisBuild / version := "1.0.1-SNAPSHOT"