Fix corss-build

scio-core/src/main/scala-2.12/com/spotify/scio/coders/instances/JavaCollectionWrappers.scala

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.spotify.scio.coders.instances
+
+import java.lang.{Iterable => JIterable}
+
+private[coders] object JavaCollectionWrappers {
+
+  // private classes
+  val JIterableWrapperClass: Class[_] =
+    Class.forName("scala.collection.convert.Wrappers.JIterableWrapper")
+  val JCollectionWrapperClass: Class[_] =
+    Class.forName("scala.collection.convert.Wrappers.JCollectionWrapper")
+  val JListWrapperClass: Class[_] =
+    Class.forName("scala.collection.convert.Wrappers.JListWrapper")
+
+  object JIterableWrapper {
+    def unapply(arg: Any): Option[JIterable[_]] = arg match {
+      case arg if arg.getClass == JListWrapperClass =>
+        val underlying = JListWrapperClass
+          .getField("underlying")
+          .get(arg)
+          .asInstanceOf[JIterable[_]]
+        Some(underlying)
+      case _ => None
+    }
+  }
+}

scio-core/src/main/scala-2.13/com/spotify/scio/coders/instances/JavaCollectionWrappers.scala

@@ -0,0 +1,25 @@
+package com.spotify.scio.coders.instances
+
+import java.lang.{Iterable => JIterable}
+private[coders] object JavaCollectionWrappers {
+
+  // private classes
+  val JIterableWrapperClass: Class[_] =
+    Class.forName("scala.collection.convert.JavaCollectionWrappers.JIterableWrapper")
+  val JCollectionWrapperClass: Class[_] =
+    Class.forName("scala.collection.convert.JavaCollectionWrappers.JCollectionWrapper")
+  val JListWrapperClass: Class[_] =
+    Class.forName("scala.collection.convert.JavaCollectionWrappers.JListWrapper")
+
+  object JIterableWrapper {
+    def unapply(arg: Any): Option[JIterable[_]] = arg match {
+      case arg if arg.getClass == JListWrapperClass =>
+        val underlying = JListWrapperClass
+          .getField("underlying")
+          .get(arg)
+          .asInstanceOf[JIterable[_]]
+        Some(underlying)
+      case _ => None
+    }
+  }
+}

scio-core/src/main/scala/com/spotify/scio/coders/KryoAtomicCoder.scala

@@ -43,10 +43,8 @@ import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.reflect.ClassPat
 import org.joda.time.{DateTime, LocalDate, LocalDateTime, LocalTime}
 import org.slf4j.LoggerFactory
 
-import _root_.java.lang.{Iterable => JIterable}
 import scala.jdk.CollectionConverters._
 import scala.collection.mutable
-import scala.collection.convert.JavaCollectionWrappers
 
 private object KryoRegistrarLoader {
   private[this] val logger = LoggerFactory.getLogger(this.getClass)

scio-core/src/main/scala/com/spotify/scio/coders/instances/ScalaCoders.scala

@@ -36,29 +36,6 @@ import scala.jdk.CollectionConverters._
 import java.util.{List => JList}
 import java.lang.{Iterable => JIterable}
 
-private[coders] object JavaCollectionWrappers {
-
-  // private classes
-  val JIterableWrapperClass: Class[_] =
-    Class.forName("scala.collection.convert.JavaCollectionWrappers.JIterableWrapper")
-  val JCollectionWrapperClass: Class[_] =
-    Class.forName("scala.collection.convert.JavaCollectionWrappers.JCollectionWrapper")
-  val JListWrapperClass: Class[_] =
-    Class.forName("scala.collection.convert.JavaCollectionWrappers.JListWrapper")
-
-  object JIterableWrapper {
-    def unapply(arg: Any): Option[JIterable[_]] = arg match {
-      case arg if arg.getClass == JListWrapperClass =>
-        val underlying = JListWrapperClass
-          .getField("underlying")
-          .get(arg)
-          .asInstanceOf[JIterable[_]]
-        Some(underlying)
-      case _ => None
-    }
-  }
-}
-
 private[coders] object UnitCoder extends AtomicCoder[Unit] {
   override def encode(value: Unit, os: OutputStream): Unit = ()
   override def decode(is: InputStream): Unit = ()