0.2.2: Bump quasar-version to 52.0.2

(Merge branch 'jsantos17-bump-quasar-52')

datasource/src/main/scala/quasar/physical/s3/S3DataSource.scala

@@ -20,8 +20,9 @@ import quasar.Data
 import quasar.api.ResourceError
 import quasar.api.ResourceError.{CommonError, ReadError}
 import quasar.api.ResourcePath.{Leaf, Root}
-import quasar.api.{DataSourceType, ResourceName, ResourcePath, ResourcePathType}
-import quasar.connector.datasource.LightweightDataSource
+import quasar.api.datasource.DatasourceType
+import quasar.api.{ResourceName, ResourcePath, ResourcePathType}
+import quasar.connector.datasource.LightweightDatasource
 import quasar.contrib.cats.effect._
 import quasar.contrib.pathy.APath
 
@@ -44,9 +45,9 @@ final class S3DataSource[F[_]: Effect, G[_]: Async] (
   client: Client[F],
   bucket: Uri,
   s3JsonParsing: S3JsonParsing)(ec: ExecutionContext)
-    extends LightweightDataSource[F, Stream[G, ?], Stream[G, Data]] {
+    extends LightweightDatasource[F, Stream[G, ?], Stream[G, Data]] {
 
-  def kind: DataSourceType = s3.datasourceKind
+  def kind: DatasourceType = s3.datasourceKind
 
   val shutdown: F[Unit] = client.shutdown
 

datasource/src/main/scala/quasar/physical/s3/S3DataSourceModule.scala

@@ -18,9 +18,11 @@ package quasar.physical.s3
 
 
 import quasar.Data
-import quasar.api.{DataSourceType, ResourcePath}
-import quasar.connector.{DataSource, LightweightDataSourceModule}
-import quasar.api.DataSourceError.{InitializationError, MalformedConfiguration}
+import quasar.api.datasource.DatasourceError.{InitializationError, MalformedConfiguration}
+import quasar.api.ResourcePath
+import quasar.api.datasource.DatasourceType
+import quasar.connector.Datasource
+import quasar.connector.LightweightDatasourceModule
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
@@ -34,18 +36,18 @@ import slamdata.Predef.{Stream => _, _}
 import org.http4s.client.blaze.Http1Client
 import shims._
 
-object S3DataSourceModule extends LightweightDataSourceModule {
-  def kind: DataSourceType = s3.datasourceKind
+object S3DataSourceModule extends LightweightDatasourceModule {
+  def kind: DatasourceType = s3.datasourceKind
 
-  def lightweightDataSource[
+  def lightweightDatasource[
       F[_]: ConcurrentEffect: Timer,
       G[_]: ConcurrentEffect: Timer](
       config: Json)
-      : F[InitializationError[Json] \/ DataSource[F, Stream[G, ?], ResourcePath, Stream[G, Data]]] = {
+      : F[InitializationError[Json] \/ Datasource[F, Stream[G, ?], ResourcePath, Stream[G, Data]]] = {
     config.as[S3Config].result match {
       case Right(s3Config) => {
         Http1Client[F]() map { client =>
-          val ds: DataSource[F, Stream[G, ?], ResourcePath, Stream[G, Data]] =
+          val ds: Datasource[F, Stream[G, ?], ResourcePath, Stream[G, Data]] =
             new S3DataSource[F, G](client, s3Config.bucket, s3Config.parsing)(global)
 
           ds.right[InitializationError[Json]]
@@ -54,7 +56,7 @@ object S3DataSourceModule extends LightweightDataSourceModule {
 
       case Left((msg, _)) =>
         (MalformedConfiguration(kind, config, msg): InitializationError[Json])
-          .left[DataSource[F, Stream[G, ?], ResourcePath, Stream[G, Data]]].point[F]
+          .left[Datasource[F, Stream[G, ?], ResourcePath, Stream[G, Data]]].point[F]
     }
   }
 }

datasource/src/main/scala/quasar/physical/s3/package.scala

@@ -16,7 +16,7 @@
 
 package quasar.physical.s3
 
-import quasar.api.DataSourceType
+import quasar.api.datasource.DatasourceType
 
 import eu.timepit.refined.auto._
 
@@ -28,5 +28,5 @@ object S3JsonParsing {
 }
 
 package object s3 {
-  val datasourceKind: DataSourceType = DataSourceType("s3", 1L)
+  val datasourceKind: DatasourceType = DatasourceType("s3", 1L)
 }

quasar-version

@@ -1 +1 @@
-49.0.3
+52.0.2

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.2.1"
+version in ThisBuild := "0.2.2"