Skip to content

Commit 2870cff

Browse files
committed
Introduce scala 3 build for spray-json
1 parent 445d792 commit 2870cff

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ jobs:
8080

8181
- name: Make target directories
8282
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
83-
run: mkdir -p circe/jvm/target playJson/native/target testkit/native/target testkit/js/target core/.native/target playJson/jvm/target sprayJson/target core/.js/target circe/js/target core/.jvm/target circe/native/target playJson/js/target testkit/jvm/target project/target
83+
run: mkdir -p circe/jvm/target playJson/native/target testkit/native/target testkit/js/target core/.native/target playJson/jvm/target core/.js/target circe/js/target core/.jvm/target circe/native/target playJson/js/target testkit/jvm/target sprayJson/.jvm/target project/target
8484

8585
- name: Compress target directories
8686
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
87-
run: tar cf targets.tar circe/jvm/target playJson/native/target testkit/native/target testkit/js/target core/.native/target playJson/jvm/target sprayJson/target core/.js/target circe/js/target core/.jvm/target circe/native/target playJson/js/target testkit/jvm/target project/target
87+
run: tar cf targets.tar circe/jvm/target playJson/native/target testkit/native/target testkit/js/target core/.native/target playJson/jvm/target core/.js/target circe/js/target core/.jvm/target circe/native/target playJson/js/target testkit/jvm/target sprayJson/.jvm/target project/target
8888

8989
- name: Upload target directories
9090
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')

build.sbt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
4545
),
4646
mimaBinaryIssueFilters ++= List(
4747
ProblemFilters.exclude[DirectMissingMethodProblem](
48-
"diffson.jsonpatch.package#simplediff#remembering.JsonDiffDiff")
48+
"diffson.jsonpatch.package#simplediff#remembering.JsonDiffDiff"),
49+
ProblemFilters.exclude[DirectAbstractMethodProblem]("diffson.lcs.Lcs.savedHashes")
4950
)
5051
)
5152

@@ -58,13 +59,14 @@ lazy val testkit = crossProject(JSPlatform, JVMPlatform, NativePlatform)
5859
"org.scalacheck" %%% "scalacheck" % scalacheckVersion))
5960
.dependsOn(core)
6061

61-
lazy val sprayJson = project
62+
lazy val sprayJson = crossProject(JVMPlatform)
63+
.crossType(CrossType.Pure)
6264
.in(file("sprayJson"))
6365
.settings(commonSettings: _*)
6466
.settings(name := "diffson-spray-json",
65-
crossScalaVersions := Seq(scala212, scala213),
66-
libraryDependencies += "io.spray" %% "spray-json" % "1.3.6")
67-
.dependsOn(core.jvm, testkit.jvm % Test)
67+
libraryDependencies += "io.spray" %% "spray-json" % "1.3.6",
68+
tlVersionIntroduced := Map("3" -> "4.4.1"))
69+
.dependsOn(core, testkit % Test)
6870

6971
lazy val playJson = crossProject(JSPlatform, JVMPlatform, NativePlatform)
7072
.crossType(CrossType.Full)

core/src/main/scala/diffson/lcs/HashedLcs.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import cats.implicits._
2626
*/
2727
class HashedLcs[T: Eq](delegate: Lcs[Hashed[T]]) extends Lcs[T] {
2828

29-
def savedHashes = this
29+
override def savedHashes: HashedLcs[T] = this
3030

3131
override def lcs(seq1: List[T], seq2: List[T], low1: Int, high1: Int, low2: Int, high2: Int): List[(Int, Int)] = {
3232
// wrap all values and delegate to proper implementation

0 commit comments

Comments
 (0)