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

Scala3 #1375

Merged
merged 8 commits into from
Jan 22, 2024
Merged

Scala3 #1375

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad814fa
drop scala 2.12, add scala 3
sirocchj Jan 21, 2024
e257ed8
updated deps
sirocchj Jan 21, 2024
fc7ceb6
Merge branch 'master' into scala3
sirocchj Jan 21, 2024
168b804
gh actions
sirocchj Jan 21, 2024
fab8739
temurin in place of adopt
sirocchj Jan 21, 2024
a54577c
Revert "temurin in place of adopt"
sirocchj Jan 21, 2024
e9e479b
restore 15, drop 17 and 21 for now
sirocchj Jan 21, 2024
4364022
rename ScalaVersionDependent to OutputStreamEncoder
sirocchj Jan 22, 2024
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
20 changes: 10 additions & 10 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
strategy:
matrix:
scala:
- 2.12.18
- 2.13.12
- 3.3.1
java:
- adopt@1.11
- adopt@1.15
Expand Down Expand Up @@ -70,9 +70,9 @@ jobs:
key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
- name: Test (${{ matrix.scala }}, ${{ matrix.java }})
run: sbt ++${{ matrix.scala }} fullTest
publish_212:
publish_213:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
name: Publish Snapshot 2.12
name: Publish Snapshot 2.13
needs: build
runs-on: ubuntu-20.04
steps:
Expand All @@ -96,17 +96,17 @@ jobs:
target
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.18 releaseIt
- name: Publish Snapshot for Scala 2.13
run: CI_SNAPSHOT_RELEASE=publish sbt ++2.13.12 releaseIt
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
publish_213:
publish_3:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
name: Publish Snapshot 2.13
needs: publish_212
name: Publish Snapshot 3
needs: publish_213
runs-on: ubuntu-20.04
steps:
- name: Branch Checkout
Expand All @@ -129,8 +129,8 @@ jobs:
target
project/target
key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
- name: Publish Snapshot for Scala 2.13
run: CI_SNAPSHOT_RELEASE=publish sbt ++2.13.12 releaseIt
- name: Publish Snapshot for Scala 3
run: CI_SNAPSHOT_RELEASE=publish sbt ++3.3.1 releaseIt
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
types:
- created
jobs:
release_212:
name: Release 2.12
release_213:
name: Release 2.13
runs-on: ubuntu-20.04
steps:
- name: Branch Checkout
Expand All @@ -30,16 +30,16 @@ jobs:
target
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.18 releaseIt
- name: Release for Scala 2.13
run: CI_RELEASE=publishSigned sbt ++2.13.12 releaseIt
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
release_213:
name: Release 2.13
needs: release_212
release_3:
name: Release 3
needs: release_213
runs-on: ubuntu-20.04
steps:
- name: Branch Checkout
Expand All @@ -64,8 +64,8 @@ jobs:
target
project/target
key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
- name: Release for Scala 2.13
run: CI_RELEASE=publishSigned sbt ++2.13.12 releaseIt
- name: Release for Scala 3
run: CI_RELEASE=publishSigned sbt ++3.3.1 releaseIt
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
Loading
Loading