From 65dd38786ba8e831c7f74e6c6ab12f4d582f1db2 Mon Sep 17 00:00:00 2001 From: Jan Chyb Date: Thu, 15 Dec 2022 13:27:57 +0100 Subject: [PATCH] Move scio-core contents to a scala-2 only module This was done to avoid hacks in build.sbt, and to keep the scio-avro dependency for Scala 2 scio-test, while removing it for Scala 3. scio-avro was not yet migrated to SCala 3, as it has some macro dependencies, that are still waiting for the macro static annotation support. --- .../main/{scala => scala-2}/com/spotify/scio/avro/AvroIO.scala | 0 .../{scala => scala-2}/com/spotify/scio/avro/AvroSysProps.scala | 0 .../main/{scala => scala-2}/com/spotify/scio/avro/package.scala | 0 .../com/spotify/scio/avro/syntax/SCollectionSyntax.scala | 0 .../com/spotify/scio/avro/syntax/ScioContextSyntax.scala | 0 .../{scala => scala-2}/com/spotify/scio/avro/syntax/Syntax.scala | 0 .../src/main/{scala => scala-2}/com/spotify/scio/avro/taps.scala | 0 .../{scala => scala-2}/com/spotify/scio/avro/types/AvroType.scala | 0 .../com/spotify/scio/avro/types/ConverterProvider.scala | 0 .../com/spotify/scio/avro/types/MacroUtil.scala | 0 .../com/spotify/scio/avro/types/SchemaProvider.scala | 0 .../com/spotify/scio/avro/types/SchemaUtil.scala | 0 .../com/spotify/scio/avro/types/TypeProvider.scala | 0 .../{scala => scala-2}/com/spotify/scio/avro/types/types.scala | 0 .../com/spotify/scio/avro/types/ConverterProviderSpec.scala | 0 .../com/spotify/scio/avro/types/ConverterProviderTest.scala | 0 .../com/spotify/scio/avro/types/SchemaProviderTest.scala | 0 .../com/spotify/scio/avro/types/SchemaUtilTest.scala | 0 .../{scala => scala-2}/com/spotify/scio/avro/types/Schemas.scala | 0 .../com/spotify/scio/avro/types/TypeProviderTest.scala | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/AvroIO.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/AvroSysProps.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/package.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/syntax/SCollectionSyntax.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/syntax/ScioContextSyntax.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/syntax/Syntax.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/taps.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/types/AvroType.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/types/ConverterProvider.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/types/MacroUtil.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/types/SchemaProvider.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/types/SchemaUtil.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/types/TypeProvider.scala (100%) rename scio-avro/src/main/{scala => scala-2}/com/spotify/scio/avro/types/types.scala (100%) rename scio-avro/src/test/{scala => scala-2}/com/spotify/scio/avro/types/ConverterProviderSpec.scala (100%) rename scio-avro/src/test/{scala => scala-2}/com/spotify/scio/avro/types/ConverterProviderTest.scala (100%) rename scio-avro/src/test/{scala => scala-2}/com/spotify/scio/avro/types/SchemaProviderTest.scala (100%) rename scio-avro/src/test/{scala => scala-2}/com/spotify/scio/avro/types/SchemaUtilTest.scala (100%) rename scio-avro/src/test/{scala => scala-2}/com/spotify/scio/avro/types/Schemas.scala (100%) rename scio-avro/src/test/{scala => scala-2}/com/spotify/scio/avro/types/TypeProviderTest.scala (100%) diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/AvroIO.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/AvroIO.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/AvroIO.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/AvroIO.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/AvroSysProps.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/AvroSysProps.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/AvroSysProps.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/AvroSysProps.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/package.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/package.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/package.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/package.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/syntax/SCollectionSyntax.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/syntax/SCollectionSyntax.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/syntax/SCollectionSyntax.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/syntax/SCollectionSyntax.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/syntax/ScioContextSyntax.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/syntax/ScioContextSyntax.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/syntax/ScioContextSyntax.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/syntax/ScioContextSyntax.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/syntax/Syntax.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/syntax/Syntax.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/syntax/Syntax.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/syntax/Syntax.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/taps.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/taps.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/taps.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/taps.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/AvroType.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/types/AvroType.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/types/AvroType.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/types/AvroType.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/ConverterProvider.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/types/ConverterProvider.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/types/ConverterProvider.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/types/ConverterProvider.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/MacroUtil.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/types/MacroUtil.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/types/MacroUtil.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/types/MacroUtil.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaProvider.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/types/SchemaProvider.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaProvider.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/types/SchemaProvider.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaUtil.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/types/SchemaUtil.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/types/SchemaUtil.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/types/SchemaUtil.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/TypeProvider.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/types/TypeProvider.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/types/TypeProvider.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/types/TypeProvider.scala diff --git a/scio-avro/src/main/scala/com/spotify/scio/avro/types/types.scala b/scio-avro/src/main/scala-2/com/spotify/scio/avro/types/types.scala similarity index 100% rename from scio-avro/src/main/scala/com/spotify/scio/avro/types/types.scala rename to scio-avro/src/main/scala-2/com/spotify/scio/avro/types/types.scala diff --git a/scio-avro/src/test/scala/com/spotify/scio/avro/types/ConverterProviderSpec.scala b/scio-avro/src/test/scala-2/com/spotify/scio/avro/types/ConverterProviderSpec.scala similarity index 100% rename from scio-avro/src/test/scala/com/spotify/scio/avro/types/ConverterProviderSpec.scala rename to scio-avro/src/test/scala-2/com/spotify/scio/avro/types/ConverterProviderSpec.scala diff --git a/scio-avro/src/test/scala/com/spotify/scio/avro/types/ConverterProviderTest.scala b/scio-avro/src/test/scala-2/com/spotify/scio/avro/types/ConverterProviderTest.scala similarity index 100% rename from scio-avro/src/test/scala/com/spotify/scio/avro/types/ConverterProviderTest.scala rename to scio-avro/src/test/scala-2/com/spotify/scio/avro/types/ConverterProviderTest.scala diff --git a/scio-avro/src/test/scala/com/spotify/scio/avro/types/SchemaProviderTest.scala b/scio-avro/src/test/scala-2/com/spotify/scio/avro/types/SchemaProviderTest.scala similarity index 100% rename from scio-avro/src/test/scala/com/spotify/scio/avro/types/SchemaProviderTest.scala rename to scio-avro/src/test/scala-2/com/spotify/scio/avro/types/SchemaProviderTest.scala diff --git a/scio-avro/src/test/scala/com/spotify/scio/avro/types/SchemaUtilTest.scala b/scio-avro/src/test/scala-2/com/spotify/scio/avro/types/SchemaUtilTest.scala similarity index 100% rename from scio-avro/src/test/scala/com/spotify/scio/avro/types/SchemaUtilTest.scala rename to scio-avro/src/test/scala-2/com/spotify/scio/avro/types/SchemaUtilTest.scala diff --git a/scio-avro/src/test/scala/com/spotify/scio/avro/types/Schemas.scala b/scio-avro/src/test/scala-2/com/spotify/scio/avro/types/Schemas.scala similarity index 100% rename from scio-avro/src/test/scala/com/spotify/scio/avro/types/Schemas.scala rename to scio-avro/src/test/scala-2/com/spotify/scio/avro/types/Schemas.scala diff --git a/scio-avro/src/test/scala/com/spotify/scio/avro/types/TypeProviderTest.scala b/scio-avro/src/test/scala-2/com/spotify/scio/avro/types/TypeProviderTest.scala similarity index 100% rename from scio-avro/src/test/scala/com/spotify/scio/avro/types/TypeProviderTest.scala rename to scio-avro/src/test/scala-2/com/spotify/scio/avro/types/TypeProviderTest.scala