Skip to content

Commit 3ec1fb6

Browse files
authored
Merge pull request #2379 from typelevel/minor_build_fixes
Minor build fixes
2 parents 5b8dd74 + f50865d commit 3ec1fb6

File tree

11 files changed

+15
-22
lines changed

11 files changed

+15
-22
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ name: Continuous Integration
1010
on:
1111
pull_request:
1212
branches: ['**', '!update/**', '!pr/**']
13-
types: [locked]
1413
push:
1514
branches: ['**', '!update/**', '!pr/**']
1615
tags: [v*]

build.sbt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ ThisBuild / githubWorkflowBuild := {
6464
case other => other
6565
}
6666
}
67-
// Disable running CI for Pull Requests (a normal push already triggers CI)
68-
// We set an uncommon status instead of empty because passing an empty list seems to make
69-
// GHA use the default trigger event types..
70-
ThisBuild / githubWorkflowPREventTypes := Seq(PREventType.Locked)
7167
ThisBuild / githubWorkflowBuildPostamble ++= Seq(
7268
WorkflowStep.Sbt(
7369
commands = List("checkGitNoUncommittedChanges"),

docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3.1"
2-
31
services:
42
postgres:
53
image: postgis/postgis:16-3.4

modules/core/src/main/scala/doobie/hi/resultset.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ object resultset {
175175
}
176176

177177
/** Equivalent to `getNext`, but verifies that there is exactly one row remaining.
178-
* @throws UnexpectedCursorPosition
178+
* @throws doobie.util.invariant.UnexpectedCursorPosition
179179
* if there is not exactly one row remaining
180180
* @group Results
181181
*/
@@ -187,7 +187,7 @@ object resultset {
187187
}
188188

189189
/** Equivalent to `getNext`, but verifies that there is at most one row remaining.
190-
* @throws UnexpectedContinuation
190+
* @throws doobie.util.invariant.UnexpectedContinuation
191191
* if there is more than one row remaining
192192
* @group Results
193193
*/
@@ -199,7 +199,7 @@ object resultset {
199199
}
200200

201201
/** Consumes the remainder of the resultset, but verifies that there is at least one row remaining.
202-
* @throws UnexpectedEnd
202+
* @throws doobie.util.invariant.UnexpectedEnd
203203
* if there is not at least one row remaining
204204
* @group Results
205205
*/

modules/core/src/main/scala/doobie/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package object doobie
3333
* 1. You're NOT using one of the database doobie has direct java.time isntances for (PostgreSQL / MySQL). (They
3434
* have more accurate column type checks) 2. Your driver natively supports java.time.* types
3535
*
36-
* If your driver doesn't support java.time.* types, use [[doobie.implicits.legacy.instant/localdate]] instead
36+
* If your driver doesn't support java.time.* types, use `doobie.implicits.legacy.instant/localdate` instead
3737
*/
3838
object javatimedrivernative extends TimeMetaInstances
3939
}

modules/core/src/main/scala/doobie/util/query.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ object query {
4040
*/
4141
def sql: String
4242

43-
/** An optional [[Pos]] indicating the source location where this [[Query]] was constructed. This is used only for
44-
* diagnostic purposes.
43+
/** An optional [[doobie.util.pos.Pos]] indicating the source location where this [[Query]] was constructed. This is
44+
* used only for diagnostic purposes.
4545
* @group Diagnostics
4646
*/
4747
def pos: Option[Pos]

modules/core/src/main/scala/doobie/util/testing.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ package testing {
5959
val header: String = show"$typeName defined at $location"
6060
}
6161

62-
/** Information from [[Analysis]], prepared for output. */
62+
/** Information from [[doobie.util.analysis.Analysis]], prepared for output. */
6363
final case class AnalysisReport(
6464
header: String,
6565
sql: Block,

modules/core/src/main/scala/doobie/util/transactor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ object transactor {
109109
/** A `Strategy` for running a program on a connection * */
110110
def strategy: Strategy
111111

112-
/** Construct a [[Yolo]] for REPL experimentation. */
112+
/** Construct a [[doobie.util.yolo.Yolo]] for REPL experimentation. */
113113
def yolo(implicit ev: Async[M]): Yolo[M] = new Yolo(this)
114114

115115
/** Construct a program to perform arbitrary configuration on the kernel value (changing the timeout on a connection

modules/core/src/main/scala/doobie/util/update.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ object update {
4646
*/
4747
val sql: String
4848

49-
/** An optional [[Pos]] indicating the source location where this [[Update]] was constructed. This is used only for
50-
* diagnostic purposes.
49+
/** An optional [[doobie.util.pos.Pos]] indicating the source location where this [[Update]] was constructed. This
50+
* is used only for diagnostic purposes.
5151
* @group Diagnostics
5252
*/
5353
val pos: Option[Pos]
@@ -297,8 +297,8 @@ object update {
297297
*/
298298
val sql: String
299299

300-
/** An optional [[Pos]] indicating the source location where this [[Update0]] was constructed. This is used only for
301-
* diagnostic purposes.
300+
/** An optional [[doobie.util.pos.Pos]] indicating the source location where this [[Update0]] was constructed. This
301+
* is used only for diagnostic purposes.
302302
* @group Diagnostics
303303
*/
304304
val pos: Option[Pos]

modules/free/src/main/scala/doobie/WeakAsync.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object WeakAsync {
5151
def liftK[F[_], G[_]](implicit F: Async[F], G: WeakAsync[G]): Resource[F, F ~> G] =
5252
Dispatcher.parallel[F].map(new Lifter(_))
5353

54-
/** Like [[liftK]] but specifically returns a [[LiftIO]] */
54+
/** Like [[liftK]] but specifically returns a [[cats.effect.LiftIO]] */
5555
def liftIO[F[_]](implicit F: WeakAsync[F]): Resource[IO, LiftIO[F]] =
5656
Dispatcher.parallel[IO].map(new Lifter(_) with LiftIO[F] {
5757
def liftIO[A](ioa: IO[A]) = super[Lifter].apply(ioa)

0 commit comments

Comments
 (0)