Skip to content
This repository has been archived by the owner on Oct 25, 2024. It is now read-only.

Commit

Permalink
Merge pull request #41 from majk-p/scala3
Browse files Browse the repository at this point in the history
  • Loading branch information
kubukoz authored May 30, 2021
2 parents 71773fd + 41035c2 commit e5388fd
Show file tree
Hide file tree
Showing 4 changed files with 4,439 additions and 701 deletions.
20 changes: 15 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.3]
scala: [2.13.6, 3.0.0]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.3]
scala: [2.13.6]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -101,12 +101,22 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

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

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

- name: Inflate target directories (3.0.0)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
15 changes: 11 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,20 @@ inThisBuild(
"Jakub Kozłowski",
"[email protected]",
url("https://blog.kubukoz.com")
),
Developer(
"majk-p",
"Michał Pawlik",
"[email protected]",
url("https://michalp.net")
)
),
sources in (Compile, doc) := Seq()
Compile / doc / sources := Seq()
)
)

val Scala213 = "2.13.3"
val Scala213 = "2.13.6"
val Scala3 = "3.0.0"

def crossPlugin(x: sbt.librarymanagement.ModuleID) = compilerPlugin(x.cross(CrossVersion.full))

Expand All @@ -29,7 +36,7 @@ val compilerPlugins = List(
val GraalVM11 = "[email protected]"

ThisBuild / scalaVersion := Scala213
ThisBuild / crossScalaVersions := Seq(Scala213)
ThisBuild / crossScalaVersions := Seq(Scala213, Scala3)
ThisBuild / githubWorkflowJavaVersions := Seq(GraalVM11)
//sbt-ci-release settings
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
Expand Down Expand Up @@ -57,7 +64,7 @@ val root = project
"release",
"+publishSigned;sonatypeBundleRelease"
),
skip in publish := true
publish / skip := true
)
.aggregate(core)
.enablePlugins(CodegenPlugin)
Loading

0 comments on commit e5388fd

Please sign in to comment.