Revert "Move sphere-json-derivation-3 to sphere-json-core (just the m…

…ain, not the tests for now)" This reverts commit f2cbf08.
commercetools · Dec 5, 2024 · 830e497 · 830e497
1 parent 4eb3676
commit 830e497
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 312 deletions.
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ lazy val scala3 = "3.5.2"
 
 // sbt-github-actions needs configuration in `ThisBuild`
 ThisBuild / crossScalaVersions := Seq(scala2_12, scala2_13, scala3)
-ThisBuild / scalaVersion := scala2_13
+ThisBuild / scalaVersion := scala3
 ThisBuild / githubWorkflowPublishTargetBranches := List()
 ThisBuild / githubWorkflowJavaVersions := List(JavaSpec.temurin("17"))
 ThisBuild / githubWorkflowBuildPreamble ++= List(

diff --git a/json/json-core/src/main/scala-3/io/sphere/json/JSON.scala b/json/json-core/src/main/scala-3/io/sphere/json/JSON.scala
diff --git a/json/json-core/src/main/scala-3/io/sphere/json/generic/AnnotationReader.scala b/json/json-core/src/main/scala-3/io/sphere/json/generic/AnnotationReader.scala
diff --git a/json/json-core/src/main/scala-3/io/sphere/json/generic/JSONAnnotation.scala b/json/json-core/src/main/scala-3/io/sphere/json/generic/JSONAnnotation.scala
diff --git a/...rc/main/scala-2/io/sphere/json/JSON.scala → .../src/main/scala/io/sphere/json/JSON.scala b/...rc/main/scala-2/io/sphere/json/JSON.scala → .../src/main/scala/io/sphere/json/JSON.scala