Skip to content

Commit

Permalink
Update Scala Native to 0.5
Browse files Browse the repository at this point in the history
- Update `specs2` to  `4.20.8`
- Update `cats-free` to `2.12.0`
- Update `cats-mtl` to `1.5.0`
  • Loading branch information
lolgab committed Aug 7, 2024
1 parent a33595c commit 8ab3f89
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 20 deletions.
39 changes: 31 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,46 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.1.3, 2.12.16, 2.13.8]
scala: [3.3.3, 2.12.19, 2.13.12]
java:
- adopt@1.8
- adopt@1.11
- adopt@1.14
- graalvm-ce-java8@20.2.0
- adopt-hotspot@8
- adopt-hotspot@11
- adopt-hotspot@17
- 'graal:20.2.0@8'
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v13
- name: Setup Java (adopt-hotspot@8)
if: matrix.java == 'adopt-hotspot@8'
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
distribution: adopt-hotspot
java-version: 8

- name: Setup Java (adopt-hotspot@11)
if: matrix.java == 'adopt-hotspot@11'
uses: actions/setup-java@v2
with:
distribution: adopt-hotspot
java-version: 11

- name: Setup Java (adopt-hotspot@17)
if: matrix.java == 'adopt-hotspot@17'
uses: actions/setup-java@v2
with:
distribution: adopt-hotspot
java-version: 17

- name: 'Setup GraalVM (graal:20.2.0@8)'
if: 'matrix.java == ''graal:20.2.0@8'''
uses: DeLaGuardo/setup-graalvm@5.0
with:
graalvm: 20.2.0
java: 8

- name: Cache sbt
uses: actions/cache@v2
Expand Down
16 changes: 10 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

ThisBuild / baseVersion := "1.2"
ThisBuild / baseVersion := "1.3"

ThisBuild / organization := "org.typelevel"
ThisBuild / organizationName := "Typelevel"
Expand All @@ -24,9 +24,13 @@ ThisBuild / publishFullName := "Daniel Spiewak"

ThisBuild / strictSemVer := false

ThisBuild / crossScalaVersions := Seq("3.1.3", "2.12.16", "2.13.8")
ThisBuild / crossScalaVersions := Seq("3.3.3", "2.12.19", "2.13.12")

ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11", "adopt@1.14", "graalvm-ce-java8@20.2.0")
ThisBuild / githubWorkflowJavaVersions := Seq(
JavaSpec(JavaSpec.Distribution.Adopt, "8"),
JavaSpec(JavaSpec.Distribution.Adopt, "11"),
JavaSpec(JavaSpec.Distribution.Adopt, "17"),
JavaSpec.graalvm("20.2.0", "8"))

ThisBuild / homepage := Some(url("https://github.com/typelevel/coop"))

Expand All @@ -41,8 +45,8 @@ lazy val root = project.in(file(".")).aggregate(core.jvm, core.js, core.native)
lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform).in(file("core"))
.settings(
name := "coop",
libraryDependencies += "org.specs2" %%% "specs2-core" % "4.16.0" % Test)
libraryDependencies += "org.specs2" %%% "specs2-core" % "4.20.8" % Test)
.settings(
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-free" % "2.8.0",
"org.typelevel" %%% "cats-mtl" % "1.3.0"))
"org.typelevel" %%% "cats-free" % "2.12.0",
"org.typelevel" %%% "cats-mtl" % "1.5.0"))
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.10.1
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.5")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1")
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13")

0 comments on commit 8ab3f89

Please sign in to comment.