Skip to content

Commit bf5a331

Browse files
committed
Set Scala 2.13 as project version and fix publish
1 parent b8678c5 commit bf5a331

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/scripts/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env bash
22

33
set -e
4-
sbt ++3.1.2 ci-release
4+
sbt ci-release

build.sbt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ skip in publish := true //required by sbt-ci-release
2121

2222
def sharedSettings(publishForScala3: Boolean= true) = {
2323
Seq(
24-
scalaVersion := "3.1.2",
25-
crossScalaVersions := Seq("2.12.17", "2.13.8") ++ (if (publishForScala3) Seq("3.1.2") else Seq.empty)
24+
scalaVersion := "2.13.8",
25+
crossScalaVersions := Seq("2.12.17", "2.13.8") ++ (if (publishForScala3) Seq("3.2.2-RC1") else Seq.empty)
2626
,
2727
publishArtifact := (CrossVersion.partialVersion(scalaVersion.value) match {
2828
case Some((3, _)) => publishForScala3
@@ -221,7 +221,6 @@ lazy val gcs = monixConnector("gcs", Dependencies.GCS , isITParallelExecution =
221221
lazy val elasticsearch = monixConnector("elasticsearch", Dependencies.Elasticsearch, isITParallelExecution = true)
222222

223223
//internal
224-
225224
lazy val awsAuth = monixConnector("aws-auth", Dependencies.AwsAuth, isMimaEnabled = false)
226225

227226
def monixConnector(
@@ -241,7 +240,13 @@ def monixConnector(
241240
.settings(sharedSettings(scala3Publish))
242241
.configs(IntegrationTest, IT)
243242
.enablePlugins(AutomateHeaderPlugin)
244-
.settings(if(isMimaEnabled) mimaSettings(s"monix-$connectorName") else Seq.empty)
243+
.settings(
244+
if(isMimaEnabled) {
245+
mimaSettings(s"monix-$connectorName")
246+
} else { Seq.empty },
247+
Compile / doc / sources := { if (scalaVersion.value.startsWith("3.")) Seq.empty else (Compile / doc / sources).value },
248+
Test / doc / sources := { if (scalaVersion.value.startsWith("3.")) Seq.empty else (Compile / doc / sources).value }
249+
)
245250
}
246251

247252
//=> non published modules
@@ -285,7 +290,7 @@ lazy val mdocSettings = Seq(
285290
.value,
286291
scalacOptions in (ScalaUnidoc, unidoc) ++= Seq(
287292
"-doc-source-url", s"https://github.com/monix/monix-connect/tree/v${version.value}€{FILE_PATH}.scala",
288-
baseDirectory.in(LocalRootProject).value.getAbsolutePath,
293+
"-sourcepath", baseDirectory.in(LocalRootProject).value.getAbsolutePath,
289294
"-doc-title", "Monix Connect",
290295
"-doc-version", s"v${version.value}",
291296
"-groups"

gcs/src/test/scala-2/monix/connect/gcp/storage/GcsBlobSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,4 +259,4 @@ class GcsBlobSpec extends AnyWordSpecLike with IdiomaticMockito with Matchers wi
259259
verify(underlying, times(1)).listAcls()
260260
}
261261
}
262-
}
262+
}

0 commit comments

Comments
 (0)