Skip to content

Commit eb74eb1

Browse files
jatcwangjatcwang
authored
Merge pull request #20 from jatcwang/dep_update
Dependency update (Scala 3.1.1)
2 parents 285f1da + 131da4c commit eb74eb1

File tree

6 files changed

+53
-50
lines changed

6 files changed

+53
-50
lines changed

‎.github/workflows/ci.yml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,21 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest]
26-
scala: [2.13.6, 3.0.1]
27-
java: [adopt@1.11]
26+
scala: [2.13.8, 3.1.1]
27+
java: [temurin@11]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout current branch (full)
3131
uses: actions/checkout@v2
3232
with:
3333
fetch-depth: 0
3434

35-
- name: Setup Java and Scala
36-
uses: olafurpg/setup-scala@v12
35+
- name: Setup Java (temurin@11)
36+
if: matrix.java == 'temurin@11'
37+
uses: actions/setup-java@v2
3738
with:
38-
java-version: ${{ matrix.java }}
39+
distribution: temurin
40+
java-version: 11
3941

4042
- name: Cache sbt
4143
uses: actions/cache@v2
@@ -58,10 +60,10 @@ jobs:
5860
run: gem install jekyll -v 4.1.1
5961

6062
- name: Check that workflows are up to date
61-
run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck'
63+
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
6264

6365
- name: Build project
64-
run: sbt --client '++${{ matrix.scala }}; test; makeMicrosite; publishLocal'
66+
run: sbt ++${{ matrix.scala }} test makeMicrosite publishLocal
6567

6668
- name: Compress target directories
6769
run: tar cf targets.tar modules/benchmarks/target target modules/munit/target docs/target modules/scalatest/target modules/core/target modules/cats/target modules/coretest/target project/target
@@ -79,19 +81,21 @@ jobs:
7981
strategy:
8082
matrix:
8183
os: [ubuntu-latest]
82-
scala: [2.13.6]
83-
java: [adopt@1.11]
84+
scala: [2.13.8]
85+
java: [temurin@11]
8486
runs-on: ${{ matrix.os }}
8587
steps:
8688
- name: Checkout current branch (full)
8789
uses: actions/checkout@v2
8890
with:
8991
fetch-depth: 0
9092

91-
- name: Setup Java and Scala
92-
uses: olafurpg/setup-scala@v12
93+
- name: Setup Java (temurin@11)
94+
if: matrix.java == 'temurin@11'
95+
uses: actions/setup-java@v2
9396
with:
94-
java-version: ${{ matrix.java }}
97+
distribution: temurin
98+
java-version: 11
9599

96100
- name: Cache sbt
97101
uses: actions/cache@v2
@@ -105,22 +109,22 @@ jobs:
105109
~/Library/Caches/Coursier/v1
106110
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
107111

108-
- name: Download target directories (2.13.6)
112+
- name: Download target directories (2.13.8)
109113
uses: actions/download-artifact@v2
110114
with:
111-
name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
115+
name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
112116

113-
- name: Inflate target directories (2.13.6)
117+
- name: Inflate target directories (2.13.8)
114118
run: |
115119
tar xf targets.tar
116120
rm targets.tar
117121
118-
- name: Download target directories (3.0.1)
122+
- name: Download target directories (3.1.1)
119123
uses: actions/download-artifact@v2
120124
with:
121-
name: target-${{ matrix.os }}-3.0.1-${{ matrix.java }}
125+
name: target-${{ matrix.os }}-3.1.1-${{ matrix.java }}
122126

123-
- name: Inflate target directories (3.0.1)
127+
- name: Inflate target directories (3.1.1)
124128
run: |
125129
tar xf targets.tar
126130
rm targets.tar
@@ -138,4 +142,4 @@ jobs:
138142
PGP_SECRET: ${{ secrets.PGP_SECRET }}
139143
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
140144
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
141-
run: sbt --client '++${{ matrix.scala }}; ci-release; publishMicrosite'
145+
run: sbt ++${{ matrix.scala }} ci-release publishMicrosite

‎.github/workflows/clean.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ jobs:
5656
printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size
5757
ghapi -X DELETE $REPO/actions/artifacts/$id
5858
done
59-
done
59+
done

‎build.sbt

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
val munitVersion = "0.7.27"
2-
val catsVersion = "2.6.1"
3-
val scalatestVersion = "3.2.9"
1+
import sbtghactions.JavaSpec
42

5-
val scala213 = "2.13.6"
6-
val scala3 = "3.0.1"
3+
val munitVersion = "0.7.29"
4+
val catsVersion = "2.7.0"
5+
val scalatestVersion = "3.2.11"
6+
7+
val scala213 = "2.13.8"
8+
val scala3 = "3.1.1"
79

810
val isScala3 = Def.setting {
911
// doesn't work well with >= 3.0.0 for `3.0.0-M1`
@@ -36,17 +38,15 @@ lazy val core = Project("difflicious-core", file("modules/core"))
3638
.settings(commonSettings)
3739
.settings(
3840
libraryDependencies ++= Seq(
39-
if (isScala3.value) "com.softwaremill.magnolia1_3" %% "magnolia" % "1.0.0-M7"
40-
// if (isScala3.value) "com.softwaremill.magnolia" %% "magnolia-core" % "2.0.0-M7-SNAPSHOT"
41-
else "com.softwaremill.magnolia1_2" %% "magnolia" % "1.0.0-M7",
42-
"dev.zio" %% "izumi-reflect" % "1.1.2",
43-
"com.lihaoyi" %% "fansi" % "0.2.14",
44-
) ++ (
45-
if (isScala3.value)
46-
Seq.empty
47-
else
48-
Seq("org.scala-lang" % "scala-reflect" % scala213)
49-
),
41+
"dev.zio" %% "izumi-reflect" % "2.0.8",
42+
"com.lihaoyi" %% "fansi" % "0.3.0",
43+
) ++ (if (isScala3.value) {
44+
Seq("com.softwaremill.magnolia1_3" %% "magnolia" % "1.0.0")
45+
} else
46+
Seq(
47+
"com.softwaremill.magnolia1_2" %% "magnolia" % "1.0.0",
48+
"org.scala-lang" % "scala-reflect" % scala213,
49+
)),
5050
Compile / sourceGenerators += Def.task {
5151
val file = (Compile / sourceManaged).value / "difflicious" / "TupleDifferInstances.scala"
5252
IO.write(file, TupleDifferInstancesGen.fileContent)
@@ -108,7 +108,6 @@ lazy val docs: Project = project
108108
.settings(
109109
libraryDependencies ++= Seq(
110110
"org.scalatest" %% "scalatest" % scalatestVersion,
111-
"org.scalameta" %% "mdoc" % "2.2.21",
112111
),
113112
makeMicrosite := Def.taskDyn {
114113
val orig = (ThisProject / makeMicrosite).taskValue
@@ -165,7 +164,7 @@ lazy val commonSettings = Seq(
165164
versionScheme := Some("early-semver"),
166165
scalacOptions ++= (if (isScala3.value) Seq.empty[String] else Seq("-Wmacros:after")),
167166
libraryDependencies ++= Seq(
168-
compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.0" cross CrossVersion.full),
167+
compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full),
169168
compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
170169
).filterNot(_ => isScala3.value),
171170
)
@@ -174,7 +173,7 @@ lazy val noPublishSettings = Seq(
174173
publish / skip := true,
175174
)
176175

177-
ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.11")
176+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))
178177
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
179178
ThisBuild / githubWorkflowPublishTargetBranches :=
180179
Seq(RefPredicate.StartsWith(Ref.Tag("v")))

‎docs/docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Difflicious helps you find and compare the differences between values.
1010
[![Release](https://img.shields.io/nexus/r/com.github.jatcwang/difflicious-munit_2.13?server=https%3A%2F%2Foss.sonatype.org)](https://oss.sonatype.org/content/repositories/releases/com/github/jatcwang/difflicious-munit_2.13/)
1111
[![(https://badges.gitter.im/gitterHQ/gitter.png)](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jatcwang/difflicious)
1212

13-
- Readable and Actionable diff results
14-
- Flexible & Configurable diffing logic
13+
- Readable diff results
14+
- Flexible diffing logic
1515
- Ignore unimportant fields when comparing
1616
- Compare `List`s of items independent of order
1717
- Match `Map` entries by key and show diffs of the values

‎project/build.properties

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

‎project/plugins.sbt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
2-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
3-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
4-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
5-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
6-
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
7-
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.12.0")
8-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.21") // override mdoc version from microsite
1+
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
2+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
3+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
4+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
5+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
6+
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
7+
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
8+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.0") // override mdoc version from microsite

0 commit comments

Comments
 (0)