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.

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

Jump to bottom

Scala 2.12.13 #412

Merged
merged 14 commits into from
Apr 29, 2021
Merged

Scala 2.12.13 #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
aff0fff
Scala 2.12.13
barambani Jan 14, 2021
f224bbe
Ci
barambani Jan 14, 2021
2c2c9da
Merge branch 'master' into scala-2.12.13
sirocchj Jan 16, 2021
8951803
Merge branch 'master' into scala-2.12.13
barambani Feb 13, 2021
41595ea
Merge branch 'master' into scala-2.12.13
sirocchj Feb 17, 2021
d36f644
Merge branch 'master' into scala-2.12.13
sirocchj Feb 21, 2021
5606709
Parallel format
barambani Feb 22, 2021
99854f5
Merge branch 'master' into scala-2.12.13
barambani Mar 5, 2021
21dce40
format
barambani Mar 5, 2021
dd8f571
Merge branch 'master' into scala-2.12.13
barambani Mar 14, 2021
2fd43e0
Merge branch 'master' into scala-2.12.13
barambani Mar 30, 2021
d3b33ab
Merge branch 'master' into scala-2.12.13
sirocchj Mar 30, 2021
a190f29
Merge branch 'master' into scala-2.12.13
sirocchj Apr 2, 2021
16248e1
Merge branch 'master' into scala-2.12.13
sirocchj Apr 29, 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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
strategy:
matrix:
scala:
- 2.12.12
- 2.12.13
- 2.13.5
java:
- [email protected]
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
project/target
key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
- name: Publish Snapshot for Scala 2.12
run: CI_SNAPSHOT_RELEASE=publish sbt ++2.12.12 releaseIt
run: CI_SNAPSHOT_RELEASE=publish sbt ++2.12.13 releaseIt
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
project/target
key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
- name: Release for Scala 2.12
run: CI_RELEASE=publishSigned sbt ++2.12.12 releaseIt
run: CI_RELEASE=publishSigned sbt ++2.12.13 releaseIt
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject}

val scala_212 = "2.12.12"
val scala_213 = "2.13.5"
val scala_212 = "2.12.13"
val scala_213 = "2.13.5"

val current_version = scala_213

val V = new {
Expand Down Expand Up @@ -393,14 +394,13 @@ lazy val laserdisc = project
addCommandAlias("benchClean", "all core-bench/clean fs2-bench/clean"),
addCommandAlias("benchCompile", "all core-bench/test:compile fs2-bench/test:compile"),
addCommandAlias("benchBuild", ";benchClean;benchCompile"),
addCommandAlias("fmt", ";scalafmt;test:scalafmt;scalafmtSbt;fs2-bench/scalafmt"),
addCommandAlias("fmt", "all scalafmt test:scalafmt scalafmtSbt fs2-bench/scalafmt"),
addCommandAlias(
"fmtCheck",
"all scalafmtCheck test:scalafmtCheck scalafmtSbtCheck fs2-bench/scalafmtCheck fs2-bench/test:scalafmtCheck"
),
addCommandAlias("fullTest", ";clean;coverage;test;coverageReport"),
addCommandAlias("prePr", ";fmtCheck;fullTest"),
// travis release aliases
addCommandAlias(
"setReleaseOptions",
"set scalacOptions ++= Seq(\"-opt:l:method\", \"-opt:l:inline\", \"-opt-inline-from:laserdisc.**\", \"-opt-inline-from:<sources>\")"
Expand Down