From 55fad6609d07ec1aea41055116aaa390b685e7f0 Mon Sep 17 00:00:00 2001 From: jeremyrsmith Date: Fri, 7 Mar 2025 14:27:16 -0800 Subject: [PATCH 1/3] Guava snuck into polynote-kernel assembly. Shade all googles. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0c86fb858..1fbb56189 100644 --- a/build.sbt +++ b/build.sbt @@ -99,7 +99,7 @@ val commonSettings = Seq( assembly / assemblyOption := { (assembly / assemblyOption).value.withIncludeScala(false) }, - assembly / assemblyShadeRules := Seq(ShadeRule.rename("shapeless.**" -> "polynote.shaded.shapeless.@1").inAll), + assembly / assemblyShadeRules := Seq(ShadeRule.rename("shapeless.**" -> "polynote.shaded.shapeless.@1", "com.google" -> "polynote.shaded.google.@1").inAll), Global / cancelable := true, addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3"), buildUI := { From 4af96ec315d81d3ef993e8e5780a77ff2a66ddce Mon Sep 17 00:00:00 2001 From: jeremyrsmith Date: Fri, 7 Mar 2025 15:30:40 -0800 Subject: [PATCH 2/3] Fix broken rule --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1fbb56189..cb63c2107 100644 --- a/build.sbt +++ b/build.sbt @@ -99,7 +99,7 @@ val commonSettings = Seq( assembly / assemblyOption := { (assembly / assemblyOption).value.withIncludeScala(false) }, - assembly / assemblyShadeRules := Seq(ShadeRule.rename("shapeless.**" -> "polynote.shaded.shapeless.@1", "com.google" -> "polynote.shaded.google.@1").inAll), + assembly / assemblyShadeRules := Seq(ShadeRule.rename("shapeless.**" -> "polynote.shaded.shapeless.@1", "com.google.**" -> "polynote.shaded.google.@1").inAll), Global / cancelable := true, addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3"), buildUI := { From 1072542842b0a692103cacca85dd4df1cf5c1492 Mon Sep 17 00:00:00 2001 From: jeremyrsmith Date: Mon, 19 May 2025 10:42:51 -0700 Subject: [PATCH 3/3] Increase default FS depth to 10 --- .../scala/polynote/server/repository/fs/LocalFilesystem.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polynote-server/src/main/scala/polynote/server/repository/fs/LocalFilesystem.scala b/polynote-server/src/main/scala/polynote/server/repository/fs/LocalFilesystem.scala index 1c3d5eec6..2c0ffd8f6 100644 --- a/polynote-server/src/main/scala/polynote/server/repository/fs/LocalFilesystem.scala +++ b/polynote-server/src/main/scala/polynote/server/repository/fs/LocalFilesystem.scala @@ -14,7 +14,7 @@ import scala.collection.JavaConverters._ import LocalFilesystem.FileChannelWALWriter import zio.stream.ZStream -class LocalFilesystem(maxDepth: Int = 4) extends NotebookFilesystem { +class LocalFilesystem(maxDepth: Int = 10) extends NotebookFilesystem { override def readPathAsString(path: Path): RIO[BaseEnv, String] = ZManaged.fromAutoCloseable(effectBlocking(Files.newInputStream(path))).use {