Merge pull request #328 from nrkno/revert-316

Use released zetasql-toolkit

.github/workflows/ci.yml

@@ -77,11 +77,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
-        run: mkdir -p transfer-client/.jvm/target google-client/.jvm/target codegen/.jvm/target prometheus/.jvm/target testing/.jvm/target http4s-client/.jvm/target core/.jvm/target zetasql/jvm/target project/target
+        run: mkdir -p transfer-client/.jvm/target google-client/.jvm/target codegen/.jvm/target prometheus/.jvm/target testing/.jvm/target http4s-client/.jvm/target core/.jvm/target zetasql/.jvm/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
-        run: tar cf targets.tar transfer-client/.jvm/target google-client/.jvm/target codegen/.jvm/target prometheus/.jvm/target testing/.jvm/target http4s-client/.jvm/target core/.jvm/target zetasql/jvm/target project/target
+        run: tar cf targets.tar transfer-client/.jvm/target google-client/.jvm/target codegen/.jvm/target prometheus/.jvm/target testing/.jvm/target http4s-client/.jvm/target core/.jvm/target zetasql/.jvm/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))

NOTICE

@@ -1,15 +1,3 @@
 bigquery
 Copyright 2020 NRK
 Licensed under MIT (see LICENSE)
-
-zetasql/src/jvm/java
-Copyright Google Inc
-Licensed under Apache 2.0
-
-zetasql/src/jvm/antlr4
-Copyright Google Inc
-Licensed under Apache 2.0
-
-project/src/main/scala/com/simplytyped
-Copyright https://github.com/ihji
-Licensed under Apache 2.0

build.sbt

@@ -195,33 +195,20 @@ lazy val prometheus = crossProject(JVMPlatform)
     )
   )
 
-def addZetaDep(module: ModuleID) =
-  module.exclude("com.google.protobuf", "protobuf-javalite").exclude("io.grpc", "*").exclude("io.netty", "*")
-
 lazy val zetasql = crossProject(JVMPlatform)
   .withoutSuffixFor(JVMPlatform)
-  .crossType(CrossType.Full)
+  .crossType(CrossType.Pure)
   .in(file("zetasql"))
   .settings(commonSettings)
   .dependsOn(core)
-  .enablePlugins(Antlr4Plugin)
   .settings(
     name := "bigquery-zetasql",
     libraryDependencies ++= Seq(
-      // "com.google.zetasql.toolkit" % "zetasql-toolkit-bigquery" % "0.4.1",
-      addZetaDep("com.google.zetasql" % "zetasql-client" % "2024.03.1"),
-      addZetaDep("com.google.zetasql" % "zetasql-types" % "2024.03.1"),
-      addZetaDep("com.google.zetasql" % "zetasql-jni-channel" % "2024.03.1"),
-      "io.netty" % "netty-transport" % "4.1.109.Final",
-      "io.netty" % "netty-codec-http2" % "4.1.109.Final",
+      ("com.google.zetasql.toolkit" % "zetasql-toolkit-core" % "0.5.0")
+        .exclude("com.google.cloud", "google-cloud-spanner"),
       "org.scalameta" %% "munit" % "0.7.29",
       "org.typelevel" %% "munit-cats-effect-3" % "1.0.7"
     ),
-    compileOrder := CompileOrder.JavaThenScala,
-    Compile / javacOptions -= "-Werror",
-    Compile / doc / sources := Nil,
-    headerSources / excludeFilter := HiddenFileFilter || "*.java",
-    Antlr4 / antlr4PackageName := Some("com.google.zetasql.toolkit.catalog.typeparser"),
     mimaBinaryIssueFilters := Nil
   )
 

docs/example_udf.md

@@ -38,8 +38,7 @@ object MyPersistentSQLUdfs {
     dataset,
     BQRoutine.Params(BQRoutine.Param("n", BQType.FLOAT64)),
     UDF.Body.Sql(bqfr"""(n + 1)"""),
-    Some(BQType.FLOAT64),
-    None
+    Some(BQType.FLOAT64)
   )
 
 }