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

Update scala-library to 2.12.18 #27

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update scala-library to 2.12.18 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.14]
scala: [2.12.18]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -50,13 +50,13 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Setup Ruby
if: matrix.scala == '2.12.14'
if: matrix.scala == '2.12.18'
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.1

- name: Install microsite dependencies
if: matrix.scala == '2.12.14'
if: matrix.scala == '2.12.18'
run: |
gem install saas
gem install jekyll -v 4.2.0
Expand All @@ -66,7 +66,7 @@ jobs:

- run: sbt --client '++${{ matrix.scala }}; test'

- if: matrix.scala == '2.12.14'
- if: matrix.scala == '2.12.18'
run: sbt --client '++${{ matrix.scala }}; site/makeMicrosite'

publish:
Expand All @@ -76,7 +76,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.14]
scala: [2.12.18]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
import sbtghactions.UseRef

val Scala212 = "2.12.14"
val Scala212 = "2.12.18"

ThisBuild / crossScalaVersions := Seq(Scala212)
ThisBuild / scalaVersion := crossScalaVersions.value.last
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/sbtdavenverse/DavenversePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object DavenversePlugin extends AutoPlugin {
import autoImport._

override def globalSettings: Seq[Setting[_]] = Seq(
crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.0"),
crossScalaVersions := Seq("2.12.18", "2.13.6", "3.0.0"),
Def.derive(scalaVersion := crossScalaVersions.value.last, default = true),
Def.derive(isDotty := scalaVersion.value.startsWith("3."))
)
Expand Down
2 changes: 1 addition & 1 deletion core/src/sbt-test/sbt-davenverse/minimal-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6")
ThisBuild / crossScalaVersions := Seq("2.12.18", "2.13.6")

name := "minimal-example"
2 changes: 1 addition & 1 deletion core/src/sbt-test/sbt-davenverse/minimal-example/expected-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.14, 2.13.6]
scala: [2.12.18, 2.13.6]
java: [adopt@1.8, adopt@1.11]
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion core/src/sbt-test/sbt-davenverse/site-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6")
ThisBuild / crossScalaVersions := Seq("2.12.18", "2.13.6")

lazy val `site-example` = project.in(file("."))
.disablePlugins(MimaPlugin)
Expand Down
2 changes: 1 addition & 1 deletion core/src/sbt-test/sbt-davenverse/site-example/expected-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.14, 2.13.6]
scala: [2.12.18, 2.13.6]
java: [adopt@1.8, adopt@1.11]
runs-on: ${{ matrix.os }}
steps:
Expand Down