Make it compile with new Java

mobimeo · Jun 11, 2024 · d4c380b · d4c380b
1 parent e32deda
commit d4c380b
Show file tree

Hide file tree

Showing 4 changed files with 1,207 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -128,7 +128,7 @@ lazy val site = project
     docsMappingsAPIDir                         := "api",
     addMappingsToSiteDir(ScalaUnidoc / packageDoc / mappings, docsMappingsAPIDir),
     libraryDependencies ++= Dependencies.site,
-    tpolecatCiModeOptions ~= { opts => opts.filterNot(_ == ScalacOptions.fatalWarnings) },
+    // tpolecatCiModeOptions ~= { opts => opts.filterNot(_ == ScalacOptions.fatalWarnings) },
     mdocExtraArguments           := Seq("--no-link-hygiene"),
     githubWorkflowArtifactUpload := false
   )
@@ -155,6 +155,15 @@ lazy val core = project
       .flatten
   )
 
+lazy val rt = project
+  .in(file("rt"))
+  .settings(commonSettings)
+  .settings(
+    name                 := "fs2-gtfs-rt",
+    Compile / PB.targets := Seq(scalapb.gen(grpc = false) -> (Compile / sourceManaged).value)
+  )
+  .dependsOn(core)
+
 lazy val rules = project
   .in(file("rules"))
   .settings(commonSettings)

diff --git a/core/src/main/scala/com/mobimeo/gtfs/model/package.scala b/core/src/main/scala/com/mobimeo/gtfs/model/package.scala
@@ -69,7 +69,7 @@ package object model {
     CellEncoder.stringEncoder.contramap(_.getCurrencyCode())
 
   implicit val localeDecoder: CellDecoder[ju.Locale] =
-    CellDecoder.stringDecoder.map(new ju.Locale(_))
+    CellDecoder.stringDecoder.map(ju.Locale.forLanguageTag(_))
 
   implicit val localeEncoder: CellEncoder[ju.Locale] =
     CellEncoder.stringEncoder.contramap(_.getISO3Language())

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ ThisBuild / libraryDependencySchemes ++= Seq(
 )
 
 // strict compiler flags
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
+// addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
 // source code formatting
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
 // coverage
@@ -21,3 +21,7 @@ addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3")
 addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
 // release automatically
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
+
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")
+
+libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.15"