Skip to content

Commit 0602311

Browse files
committed
Change package name
1 parent 20bfa3d commit 0602311

313 files changed

Lines changed: 1110 additions & 1069 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ We cleaned up the add-on modules a bit and made some naming simplifications that
244244
- There is now a **ScalaTest** add-on. See the book chapter on unit testing for details and examples.
245245
- The `contrib` segment has been removed from module names, so `doobie-contrib-h2` is now just `doobie-h2`. It has also been removed from *package* names. So `doobie.contrib.h2` is now just `doobie.h2`.
246246
- In both cases the `postgresql` segment has been shortened to `postgres`.
247-
- All modules now have a consistent import story. `import doobie.<module>.imports._` should get you everything you need.
247+
- All modules now have a consistent import story. `import org.typelevel.doobie.<module>.imports._` should get you everything you need.
248248

249249
That's it! Enjoy the release. Once again many thanks to our contributors.
250250

build.sbt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ lazy val free = projectMatrix
240240
scalaOrganization.value % "scala-reflect" % scalaVersion.value // required for macros
241241
).filterNot(_ => tlIsScala3.value),
242242
freeGen2Dir := (Compile / scalaSource).value / "doobie" / "free",
243-
freeGen2Package := "doobie.free",
243+
freeGen2Package := "org.typelevel.doobie.free",
244244
freeGen2Classes := {
245245
List[Class[?]](
246246
classOf[java.sql.NClob],
@@ -308,7 +308,7 @@ lazy val core = projectMatrix
308308
val t = System.currentTimeMillis
309309
IO.write(
310310
outFile,
311-
s"""|package doobie
311+
s"""|package org.typelevel.doobie
312312
|
313313
|/** Auto-generated build information. */
314314
|object buildinfo {
@@ -379,7 +379,7 @@ lazy val postgres = projectMatrix
379379
"org.scala-lang.modules" %% "scala-collection-compat" % scalaCollectionCompatVersion % Test
380380
),
381381
freeGen2Dir := (Compile / scalaSource).value / "doobie" / "postgres" / "free",
382-
freeGen2Package := "doobie.postgres.free",
382+
freeGen2Package := "org.typelevel.doobie.postgres.free",
383383
freeGen2Classes := {
384384
List[Class[?]](
385385
classOf[org.postgresql.copy.CopyIn],
@@ -406,8 +406,10 @@ lazy val postgres = projectMatrix
406406
initialCommands :=
407407
"""
408408
import cats._, cats.data._, cats.implicits._, cats.effect._
409-
import doobie._, doobie.implicits._
410-
import doobie.postgres._, doobie.postgres.implicits._
409+
import org.typelevel.doobie._
410+
import org.typelevel.doobie.implicits._
411+
import org.typelevel.doobie.postgres._,
412+
import org.typelevel.doobie.postgres.implicits._
411413
implicit val cs = IO.contextShift(scala.concurrent.ExecutionContext.global)
412414
val xa = Transactor.fromDriverManager[IO](driver = "org.postgresql.Driver", url = "jdbc:postgresql:world", user = "postgres", pass = "password", logHandler = None)
413415
val yolo = xa.yolo

modules/bench/src/main/scala/doobie/bench/large.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// This software is licensed under the MIT License (MIT).
33
// For more information see LICENSE or https://opensource.org/licenses/MIT
44

5-
package doobie.bench
5+
package org.typelevel.doobie.bench
66

77
import cats.effect.IO
88
import com.zaxxer.hikari.{HikariConfig, HikariDataSource}
9-
import doobie.*
10-
import doobie.syntax.all.*
9+
import org.typelevel.doobie.*
10+
import org.typelevel.doobie.syntax.all.*
1111
import org.openjdk.jmh.annotations.*
1212
import org.openjdk.jmh.infra.Blackhole
1313
import scala.util.Using
@@ -102,14 +102,14 @@ class LargeRow {
102102

103103
@Benchmark
104104
def autoDerivedComplex(bh: Blackhole): Unit = {
105-
import doobie.implicits.*
105+
import org.typelevel.doobie.implicits.*
106106
bh.consume(sql"""SELECT col1, col2, col3, col4, col5, col6, col7, col8 FROM data"""
107107
.query[Complex].to[List].transact(xa).unsafeRunSync())
108108
}
109109

110110
@Benchmark
111111
def autoDerivedComplexOpt(bh: Blackhole): Unit = {
112-
import doobie.implicits.*
112+
import org.typelevel.doobie.implicits.*
113113
bh.consume(sql"""SELECT col1, col2, col3, col4, col5, col6, col7, col8 FROM data"""
114114
.query[Option[Complex]].to[List].transact(xa).unsafeRunSync())
115115
}

modules/bench/src/main/scala/doobie/bench/select.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
// This software is licensed under the MIT License (MIT).
33
// For more information see LICENSE or https://opensource.org/licenses/MIT
44

5-
package doobie.bench
5+
package org.typelevel.doobie.bench
66

77
import cats.effect.IO
8-
import doobie.*, doobie.implicits.*
8+
import org.typelevel.doobie.*
9+
import org.typelevel.doobie.implicits.*
910
import java.sql.DriverManager
1011
import org.openjdk.jmh.annotations.*
1112

modules/bench/src/main/scala/doobie/bench/text.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// This software is licensed under the MIT License (MIT).
33
// For more information see LICENSE or https://opensource.org/licenses/MIT
44

5-
package doobie.bench
5+
package org.typelevel.doobie.bench
66

77
import cats.syntax.all.*
8-
import doobie.*
9-
import doobie.implicits.*
10-
import doobie.postgres.implicits.*
8+
import org.typelevel.doobie.*
9+
import org.typelevel.doobie.implicits.*
10+
import org.typelevel.doobie.postgres.implicits.*
1111
import fs2.*
1212
import org.openjdk.jmh.annotations.*
1313

modules/core/src/main/scala-2.13+/doobie/util/MultiVersionTypeSupport.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This software is licensed under the MIT License (MIT).
33
// For more information see LICENSE or https://opensource.org/licenses/MIT
44

5-
package doobie.util
5+
package org.typelevel.doobie.util
66

77
private[util] object MultiVersionTypeSupport {
88
type =:=[A, B] = scala.=:=[A, B]

modules/core/src/main/scala-2.13+/doobie/util/compat/FactoryCompat.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This software is licensed under the MIT License (MIT).
33
// For more information see LICENSE or https://opensource.org/licenses/MIT
44

5-
package doobie.util.compat
5+
package org.typelevel.doobie.util.compat
66

77
import scala.annotation.implicitNotFound
88
import scala.collection.Factory

modules/core/src/main/scala-2.13+/doobie/util/compat/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This software is licensed under the MIT License (MIT).
33
// For more information see LICENSE or https://opensource.org/licenses/MIT
44

5-
package doobie.util
5+
package org.typelevel.doobie.util
66

77
import java.util as ju
88
import scala.collection.mutable

modules/core/src/main/scala-2.13-/doobie/util/MultiVersionTypeSupport.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This software is licensed under the MIT License (MIT).
33
// For more information see LICENSE or https://opensource.org/licenses/MIT
44

5-
package doobie.util
5+
package org.typelevel.doobie.util
66

77
private[util] object MultiVersionTypeSupport {
88
type =:=[A, B] = scala.Predef.=:=[A, B]

modules/core/src/main/scala-2.13-/doobie/util/compat/FactoryCompat.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This software is licensed under the MIT License (MIT).
33
// For more information see LICENSE or https://opensource.org/licenses/MIT
44

5-
package doobie.util.compat
5+
package org.typelevel.doobie.util.compat
66

77
import scala.annotation.implicitNotFound
88
import scala.collection.generic.CanBuildFrom

0 commit comments

Comments
 (0)