Skip to content

Improve sbt/gh actions infrastructure #466

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.

Sign up for GitHub

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

Closed
wants to merge 7 commits into from
Closed

Improve sbt/gh actions infrastructure #466

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d99657e
Update sbt, fix syntax
armanbilge Aug 10, 2021
fa37281
Merge branch 'series/1.x' into topic/sbt-infrastructure
armanbilge Aug 10, 2021
b8a9432
Use sbt-github-actions and sbt-ci-release
armanbilge Aug 10, 2021
876345d
Bump scalatex version
armanbilge Aug 10, 2021
5dc9494
Run readme only on 2.12/1.0
armanbilge Aug 10, 2021
3849ea2
Tweaking
armanbilge Aug 10, 2021
001eb7c
bump back scalatex version
armanbilge Aug 10, 2021
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
17 changes: 11 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@ lazy val root = project.in(file(".")).

name := "Scala.js DOM"

crossScalaVersions in ThisBuild := {
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1")
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
lazy val scala210 = "2.10.7"
lazy val scala211 = "2.11.12"
lazy val scala212 = "2.12.10"
lazy val scala213 = "2.13.1"
Comment on lines +8 to +11
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be good to update some of these, I think @sjrd likes to keep them in sync with their respective Scala.js version.


ThisBuild / crossScalaVersions := {
if (scalaJSVersion.startsWith("1.")) Seq(scala212, scala211, scala213)
else Seq(scala212, scala211, scala210, scala213)
}
scalaVersion in ThisBuild := crossScalaVersions.value.head
ThisBuild / scalaVersion := crossScalaVersions.value.head

val commonSettings = Seq(
version := "1.2.0-SNAPSHOT",
Expand Down Expand Up @@ -112,9 +117,9 @@ lazy val readme = ScalatexReadme(
source = "Index",
autoResources = Seq("example-opt.js")
).settings(
scalaVersion := "2.12.10",
scalaVersion := scala210,
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
(resources in Compile) += (fullOptJS in (example, Compile)).value.data
(Compile / resources) += (example / Compile / fullOptJS).value.data
)

lazy val example = project.
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.5.5