Skip to content
This repository has been archived by the owner on Jul 30, 2022. It is now read-only.

Commit

Permalink
Merge pull request #27 from lorandszakacs/release/scala-3-support
Browse files Browse the repository at this point in the history
Scala 3.0.0 support
  • Loading branch information
lorandszakacs authored May 13, 2021
2 parents 9944ecd + 38e4ab9 commit 1608779
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 28 deletions.
20 changes: 5 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.0-RC3, 3.0.0-RC2, 2.13.5, 2.12.13]
scala: [3.0.0, 2.13.5, 2.12.13]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.0-RC3]
scala: [3.0.0]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -99,22 +99,12 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (3.0.0-RC3)
- name: Download target directories (3.0.0)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC3-${{ matrix.java }}
name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC3)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.0.0-RC2)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}

- name: Inflate target directories (3.0.0-RC2)
- name: Inflate target directories (3.0.0)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

# unreleased

### new scala versions:

- `3.0.0` :party: — JVM, and JS

### dropped scala versions:

- `3.0.0-RC1`
- `3.0.0-RC2`

### dependency upgrades

- [cats-core](https://github.com/typelevel/cats) `2.6.1`
- [shapeless](https://github.com/milessabin/shapeless) `2.3.6` — only used for Scala 2
- [munit](https://github.com/scalameta/munit/releases) `0.7.26`

# 0.0.3

Maintenance release. No breaking changes, source, or binary.
Expand Down
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ Global / onChangedBuildSource := ReloadOnSourceChanges

val Scala212 = "2.12.13"
val Scala213 = "2.13.5"
val Scala3RC2 = "3.0.0-RC2"
val Scala3RC3 = "3.0.0-RC3"
val Scala3 = "3.0.0"

//=============================================================================
//============================ publishing details =============================
//=============================================================================

ThisBuild / baseVersion := "0.0.3"
ThisBuild / baseVersion := "0.0.4"
ThisBuild / organization := "com.lorandszakacs"
ThisBuild / homepage := Option(url("https://github.com/lorandszakacs/sprout"))

Expand Down Expand Up @@ -56,24 +55,25 @@ ThisBuild / spiewakCiReleaseSnapshots := false
ThisBuild / spiewakMainBranches := List("main")
ThisBuild / Test / publishArtifact := false

ThisBuild / scalaVersion := Scala3RC3
ThisBuild / crossScalaVersions := List(Scala3RC3, Scala3RC2, Scala213, Scala212)
ThisBuild / scalaVersion := Scala3
ThisBuild / crossScalaVersions := List(Scala3, Scala213, Scala212)

//required for binary compat checks
ThisBuild / versionIntroduced := Map(
Scala212 -> "0.0.1",
Scala213 -> "0.0.1",
"3.0.0-RC1" -> "0.0.1",
Scala3RC2 -> "0.0.2",
Scala3RC3 -> "0.0.3"
"3.0.0-RC2" -> "0.0.2",
"3.0.0-RC3" -> "0.0.3",
Scala3 -> "0.0.4"
)

//=============================================================================
//============================== Project details ==============================
//=============================================================================
// format: off
val catsV = "2.6.0" // https://github.com/typelevel/cats/releases
val munitV = "0.7.25" // https://github.com/scalameta/munit/releases
val catsV = "2.6.1" // https://github.com/typelevel/cats/releases
val munitV = "0.7.26" // https://github.com/scalameta/munit/releases
val shapelessV = "2.3.6" // https://github.com/milessabin/shapeless/releases
// format: on

Expand Down
9 changes: 5 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// format: off
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4") //https://github.com/djspiewak/sbt-spiewak/releases/
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") //https://github.com/scalameta/sbt-scalafmt/releases
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0") //https://github.com/portable-scala/sbt-crossproject/releases
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1") //https://github.com/scala-js/scala-js/releases/
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2" ) // https://github.com/scalameta/sbt-scalafmt/releases
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1" ) // https://github.com/scala-js/scala-js/releases/
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0" ) // https://github.com/portable-scala/sbt-crossproject/releases
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4") // https://github.com/djspiewak/sbt-spiewak/releases/
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.5" ) // temporary until sbt-spiewak updates!

0 comments on commit 1608779

Please sign in to comment.