Upgrade to scala3

.apibuilder/config

@@ -3,4 +3,4 @@ code:
     apibuilder-spec:
       version: latest
       generators:
-        play_2_x_standalone_json: src/main/scala/io/apibuilder/generated
+        play_2_x_scala_3_standalone_json: src/main/scala/io/apibuilder/generated

DEVELOPER.md

@@ -13,10 +13,6 @@ apibuilder download apicollective apibuilder-explicit-validation-core latest ser
 
 apibuilder download apicollective apibuilder-explicit-validation latest service > ./src/test/resources/apibuilder-explicit-validation-service.json
 
-apibuilder download flow api latest service > ./src/test/resources/flow-api-service.json
-
-apibuilder download flow api-internal latest service > ./src/test/resources/flow-api-internal-service.json
-
 apibuilder download apicollective apibuilder-api latest service > ./src/test/resources/apibuilder-api-service.json
 
 apibuilder download apicollective apibuilder-common latest service > ./src/test/resources/apibuilder-common-service.json

apibuilder-explicit-validation.json

@@ -84,12 +84,6 @@
       ]
     },
 
-    "browser_bundle_form": {
-      "fields": [
-        { "name": "feature", "type": "browser_bundle_feature_form", "required": false }
-      ]
-    },
-
     "browser_bundle_form": {
       "fields": [
         { "name": "optin", "type": "browser_bundle_optin_form", "required": false },

build.sbt

@@ -2,31 +2,15 @@ name := "apibuilder-validation"
 
 organization := "io.apibuilder"
 
-ThisBuild / scalaVersion := "2.13.10"
-
-crossScalaVersions := Seq("2.13.10")
+ThisBuild / scalaVersion := "3.4.2"
 
 lazy val allScalacOptions = Seq(
-  "-deprecation",
   "-feature",
   "-Xfatal-warnings",
-  "-unchecked",
-  "-Xcheckinit",
-  "-Xlint:adapted-args",
-  "-Ypatmat-exhaust-depth", "100", // Fixes: Exhaustivity analysis reached max recursion depth, not all missing cases are reported.
-  "-Wconf:src=generated/.*:silent",
-  "-Wconf:src=target/.*:silent", // silence the unused imports errors generated by the Play Routes
 )
 
 lazy val resolversSettings = Seq(
-  resolvers += "Artifactory" at "https://flow.jfrog.io/flow/libs-release/",
-  resolvers += "Flow Artifactory" at "https://flow.jfrog.io/flow/libs-release-local/",
-  credentials += Credentials(
-    "Artifactory Realm",
-    "flow.jfrog.io",
-    System.getenv("ARTIFACTORY_USERNAME"),
-    System.getenv("ARTIFACTORY_PASSWORD")
-  )
+  resolvers += "jitpack" at "https://jitpack.io"
 )
 
 lazy val root = project
@@ -35,28 +19,12 @@ lazy val root = project
   .settings(
     testOptions += Tests.Argument("-oF"),
     libraryDependencies ++= Seq(
-      "io.apibuilder" %% "apibuilder-commons" % "0.0.6",
-      "com.typesafe.play" %% "play-json" % "2.9.0",
-      "com.typesafe.play" %% "play-json-joda" % "2.9.0",
-      "org.apache.commons" % "commons-compress" % "1.20",
-      "org.typelevel" %% "cats-core" % "2.1.1",
-      "org.scalatest" %% "scalatest" % "3.2.9" % Test,
-    ),
-    credentials += Credentials(
-      "Artifactory Realm",
-      "flow.jfrog.io",
-      System.getenv("ARTIFACTORY_USERNAME"),
-      System.getenv("ARTIFACTORY_PASSWORD")
+      "com.github.apicollective" % "apibuilder-commons" % "0.1.0",
+      "com.typesafe.play" %% "play-json" % "2.10.6",
+      "com.typesafe.play" %% "play-json-joda" % "2.10.6",
+      "org.apache.commons" % "commons-compress" % "1.26.2",
+      "org.typelevel" %% "cats-core" % "2.12.0",
+      "org.scalatest" %% "scalatest" % "3.2.19" % Test,
     ),
     scalacOptions ++= allScalacOptions,
   )
-
-publishTo := {
-  val host = "https://flow.jfrog.io/flow"
-  if (isSnapshot.value) {
-    Some("Artifactory Realm" at s"$host/libs-snapshot-local;build.timestamp=" + new java.util.Date().getTime)
-  } else {
-    Some("Artifactory Realm" at s"$host/libs-release-local")
-  }
-}
-version := "0.4.33"

project/build.properties

@@ -1 +1,3 @@
-sbt.version=1.8.2
+sbt.version=1.10.0
+
+

project/plugins.sbt

@@ -1,7 +1,2 @@
 // Comment to get more information during initialization
 logLevel := Level.Warn
-
-// Artifactory credentials
-credentials += Credentials(Path.userHome / ".ivy2" / ".artifactory")
-
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.10")

src/main/scala/io/apibuilder/ApiBuilderHelper.scala

@@ -1,7 +1,7 @@
 package apibuilder
 
-import io.apibuilder.spec.v0.models._
-import io.apibuilder.validation.{AnyType, ApiBuilderField, ApiBuilderService, ApiBuilderType, ApiBuilderUnionType, MultiService, ScalarType, TypeName}
+import io.apibuilder.spec.v0.models.*
+import io.apibuilder.validation.*
 
 import scala.annotation.tailrec
 import scala.util.matching.Regex
@@ -49,7 +49,7 @@ trait ApiBuilderHelper {
   def resolveType(service: Service, parameter: Parameter): Option[AnyType] = resolveType(service, parameter.`type`)
 
   def resolveType(typeName: TypeName): Option[AnyType] = {
-    multiService.services().find(_.namespace == typeName.namespace).flatMap { s =>
+    multiService.services.find(_.namespace == typeName.namespace).flatMap { s =>
       resolveType(s, typeName.name)
     }
   }

src/main/scala/io/apibuilder/builders/ApiBuilderServiceBuilders.scala

@@ -14,7 +14,7 @@ trait ApiBuilderServiceBuilders {
   }
 
   def makeService(
-    apidoc: Apidoc = makeApidoc(),
+    apidoc: Option[Apidoc] = None,
     name: String = random(),
     organization: Organization = makeOrganization(),
     application: Application = makeApplication(),