update to scala 3.4.1 (#1643)

Netflix · Mar 31, 2024 · de7423f · de7423f
1 parent fc5797e
commit de7423f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         java: [17, 21]
-        scala: [2.13.13, 3.4.0]
+        scala: [2.13.13, 3.4.1]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -28,7 +28,6 @@ object BuildSettings {
       }
     },
     javacOptions ++= Seq("--release", "17"),
-    Compile / doc / sources := (Compile / doc / sources).value.filterNot(skipForDocs),
     crossPaths := true,
     crossScalaVersions := Dependencies.Versions.crossScala,
     sourcesInBase := false,
@@ -68,13 +67,4 @@ object BuildSettings {
       .settings(buildSettings: _*)
       .settings(libraryDependencies ++= commonDeps)
   }
-
-  /** Ignoring all scala files will cause it to use javadoc instead. This is done to workaround
-    * an issue with scaladoc on 3.x:
-    *
-    * https://github.com/Netflix/atlas/issues/1568
-    */
-  def skipForDocs(f: File): Boolean = {
-    f.getName.endsWith(".scala") || f.getName == "Evaluator.java"
-  }
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -14,7 +14,7 @@ object Dependencies {
     val spectator  = "1.7.8"
     val spring     = "6.1.4"
 
-    val crossScala = Seq(scala, "3.4.0")
+    val crossScala = Seq(scala, "3.4.1")
   }
 
   import Versions._