Skip to content

Commit ae23f57

Browse files
SystemFwSystemFw
authored
Merge pull request #6 from kubukoz/scala3
Scala 3 final
2 parents 4da47ac + af9e4b7 commit ae23f57

File tree

5 files changed

+45
-39
lines changed

5 files changed

+45
-39
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ name: Continuous Integration
99

1010
on:
1111
pull_request:
12-
branches: ['*']
12+
branches: ['**']
1313
push:
14-
branches: ['*']
14+
branches: ['**']
1515
tags: [v*]
1616

1717
env:
@@ -26,8 +26,8 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest]
29-
scala: [2.13.4, 3.0.0-RC2, 2.12.10]
30-
java: [adopt@1.8]
29+
scala: [2.13.6, 3.0.0, 2.12.14]
30+
java: [adopt@1.11.0-11]
3131
runs-on: ${{ matrix.os }}
3232
steps:
3333
- name: Checkout current branch (full)
@@ -53,12 +53,12 @@ jobs:
5353
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
5454

5555
- name: Check that workflows are up to date
56-
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
56+
run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck'
5757

58-
- run: sbt ++${{ matrix.scala }} ci
58+
- run: sbt --client '++${{ matrix.scala }}; ci'
5959

60-
- if: matrix.scala == '2.13.4'
61-
run: sbt ++${{ matrix.scala }} docs/mdoc
60+
- if: matrix.scala == '2.13.6'
61+
run: sbt --client '++${{ matrix.scala }}; docs/mdoc'
6262

6363
- name: Compress target directories
6464
run: tar cf targets.tar target modules/core/target project/target
@@ -76,8 +76,8 @@ jobs:
7676
strategy:
7777
matrix:
7878
os: [ubuntu-latest]
79-
scala: [2.13.4]
80-
java: [adopt@1.8]
79+
scala: [2.13.6]
80+
java: [adopt@1.11.0-11]
8181
runs-on: ${{ matrix.os }}
8282
steps:
8383
- name: Checkout current branch (full)
@@ -102,40 +102,40 @@ jobs:
102102
~/Library/Caches/Coursier/v1
103103
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
104104

105-
- name: Download target directories (2.13.4)
105+
- name: Download target directories (2.13.6)
106106
uses: actions/download-artifact@v2
107107
with:
108-
name: target-${{ matrix.os }}-2.13.4-${{ matrix.java }}
108+
name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
109109

110-
- name: Inflate target directories (2.13.4)
110+
- name: Inflate target directories (2.13.6)
111111
run: |
112112
tar xf targets.tar
113113
rm targets.tar
114114
115-
- name: Download target directories (3.0.0-RC2)
115+
- name: Download target directories (3.0.0)
116116
uses: actions/download-artifact@v2
117117
with:
118-
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
118+
name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }}
119119

120-
- name: Inflate target directories (3.0.0-RC2)
120+
- name: Inflate target directories (3.0.0)
121121
run: |
122122
tar xf targets.tar
123123
rm targets.tar
124124
125-
- name: Download target directories (2.12.10)
125+
- name: Download target directories (2.12.14)
126126
uses: actions/download-artifact@v2
127127
with:
128-
name: target-${{ matrix.os }}-2.12.10-${{ matrix.java }}
128+
name: target-${{ matrix.os }}-2.12.14-${{ matrix.java }}
129129

130-
- name: Inflate target directories (2.12.10)
130+
- name: Inflate target directories (2.12.14)
131131
run: |
132132
tar xf targets.tar
133133
rm targets.tar
134134
135135
- name: Import signing key
136136
run: echo $PGP_SECRET | base64 -d | gpg --import
137137

138-
- run: sbt ++${{ matrix.scala }} release
138+
- run: sbt --client '++${{ matrix.scala }}; release'
139139

140140
docs:
141141
name: Deploy docs
@@ -148,32 +148,32 @@ jobs:
148148
java: [[email protected]]
149149
runs-on: ${{ matrix.os }}
150150
steps:
151-
- name: Download target directories (2.13.4)
151+
- name: Download target directories (2.13.6)
152152
uses: actions/download-artifact@v2
153153
with:
154-
name: target-${{ matrix.os }}-2.13.4-${{ matrix.java }}
154+
name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
155155

156-
- name: Inflate target directories (2.13.4)
156+
- name: Inflate target directories (2.13.6)
157157
run: |
158158
tar xf targets.tar
159159
rm targets.tar
160160
161-
- name: Download target directories (3.0.0-RC2)
161+
- name: Download target directories (3.0.0)
162162
uses: actions/download-artifact@v2
163163
with:
164-
name: target-${{ matrix.os }}-3.0.0-RC2-${{ matrix.java }}
164+
name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }}
165165

166-
- name: Inflate target directories (3.0.0-RC2)
166+
- name: Inflate target directories (3.0.0)
167167
run: |
168168
tar xf targets.tar
169169
rm targets.tar
170170
171-
- name: Download target directories (2.12.10)
171+
- name: Download target directories (2.12.14)
172172
uses: actions/download-artifact@v2
173173
with:
174-
name: target-${{ matrix.os }}-2.12.10-${{ matrix.java }}
174+
name: target-${{ matrix.os }}-2.12.14-${{ matrix.java }}
175175

176-
- name: Inflate target directories (2.12.10)
176+
- name: Inflate target directories (2.12.14)
177177
run: |
178178
tar xf targets.tar
179179
rm targets.tar

‎build.sbt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ ThisBuild / scmInfo := Some(
1414
ThisBuild / startYear := Some(2020)
1515
Global / excludeLintKeys += scmInfo
1616

17-
val Scala213 = "2.13.4"
17+
val Scala213 = "2.13.6"
1818
ThisBuild / spiewakMainBranches := Seq("main")
1919

20-
ThisBuild / crossScalaVersions := Seq(Scala213, "3.0.0-RC2", "2.12.10")
21-
ThisBuild / versionIntroduced := Map("3.0.0-RC1" -> "3.0.0")
20+
ThisBuild / crossScalaVersions := Seq(Scala213, "3.0.0", "2.12.14")
21+
ThisBuild / versionIntroduced := Map("3.0.0" -> "0.3.0")
2222
ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head
2323
ThisBuild / initialCommands := """
2424
|import cats._, data._, syntax.all._
@@ -43,11 +43,11 @@ lazy val core = project
4343
name := "dynosaur-core",
4444
scalafmtOnCompile := true,
4545
libraryDependencies ++=
46-
dep("org.typelevel", "cats-", "2.6.0")("core", "free")() ++
47-
dep("org.typelevel", "", "2.6.0")("alleycats-core")() ++
48-
dep("org.scodec", "scodec-bits", "1.1.26")("")() ++
46+
dep("org.typelevel", "cats-", "2.6.1")("core", "free")() ++
47+
dep("org.typelevel", "", "2.6.1")("alleycats-core")() ++
48+
dep("org.scodec", "scodec-bits", "1.1.27")("")() ++
4949
dep("org.scalameta", "munit", "0.7.25")()("", "-scalacheck") ++
50-
dep("org.typelevel", "paiges-", "0.4.1")("core", "cats")() ++
50+
dep("org.typelevel", "paiges-", "0.4.2")("core", "cats")() ++
5151
Seq("software.amazon.awssdk" % "dynamodb" % "2.14.15")
5252
)
5353

@@ -68,6 +68,8 @@ lazy val docs = project
6868
.dependsOn(core)
6969
.enablePlugins(MdocPlugin, NoPublishPlugin)
7070

71+
ThisBuild / githubWorkflowJavaVersions := Seq("[email protected]")
72+
7173
ThisBuild / githubWorkflowBuildPostamble ++= List(
7274
WorkflowStep.Sbt(
7375
List("docs/mdoc"),

‎modules/core/src/main/scala/DynamoValue.scala‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,11 @@ object DynamoValue {
167167
*/
168168
case class Number(value: String)
169169
object Number {
170-
def of[A: Numeric](a: A): Number = Number(a.toString)
170+
def of[A: Numeric](a: A): Number = {
171+
// to avoid unused value warning
172+
val _ = implicitly[Numeric[A]]
173+
Number(a.toString)
174+
}
171175
}
172176

173177
val nul: DynamoValue =

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.4
1+
sbt.version=1.5.4

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.20.4")
1+
addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.21.0")
22
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
33
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.13")

0 commit comments

Comments
 (0)