From 82a1563eb053d51ebe5a6388d1df2c6f8cfb598a Mon Sep 17 00:00:00 2001 From: ThanhPV Date: Fri, 22 Sep 2023 15:36:48 +0700 Subject: [PATCH] Update couchbase scala-client 1.4.10 to 1.4.10-patch2 --- .github/workflows/sbt-devops.yml | 4 ++++ build.sbt | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sbt-devops.yml b/.github/workflows/sbt-devops.yml index 2b30b63..ac1b14c 100644 --- a/.github/workflows/sbt-devops.yml +++ b/.github/workflows/sbt-devops.yml @@ -23,6 +23,8 @@ jobs: - run: ./run-cb-test-container.sh env: CB_VERSION: ${{ matrix.couchbase }} + NEXUS_USER: ${{ secrets.NEXUS_USER }} + NEXUS_PASS: ${{ secrets.NEXUS_PASS }} - run: sbt test # https://www.scala-sbt.org/1.x/docs/GitHub-Actions-with-sbt.html#Caching - run: | @@ -58,6 +60,8 @@ jobs: PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + NEXUS_USER: ${{ secrets.NEXUS_USER }} + NEXUS_PASS: ${{ secrets.NEXUS_PASS }} # optional #CI_CLEAN: '; clean ; sonatypeBundleClean' #CI_RELEASE: '+publishSigned' diff --git a/build.sbt b/build.sbt index 23ffa7c..e69ab8a 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,9 @@ val emptyDoc = Compile / packageDoc / mappings := Seq( (ThisBuild / baseDirectory).value / "README.md" -> "README.md" ) +val nexus = "https://repo.bennuoc.com/repository/maven" +resolvers += "Nexus" at s"$nexus-public" + def resourcePrepare(extra: Def.Initialize[Task[String]]) = resourceGenerators += Def.task { val f = managedResourceDirectories.value.head / "application.conf" @@ -37,12 +40,13 @@ lazy val `couchbase-scala` = projectMatrix .configAxis(config14, Seq(scala212, scala213)) .settings( libraryDependencies ++= Seq( - "com.couchbase.client" %% "scala-client" % "1.4.10", + "com.couchbase.client" %% "scala-client" % "1.4.10-patch2", "javax.inject" % "javax.inject" % "1", "com.typesafe.play" %% "play-json" % "2.10.0-RC5", "com.typesafe" % "config" % configAxis.value.version, "com.google.inject" % "guice" % "5.0.1" % Test, ) ++ specs2("-core").value, + resolvers += "Nexus" at s"$nexus-public", emptyDoc, inConfig(Test)(resourcePrepare(Def.task { val cp = (`compat-test` / Runtime / fullClasspath).value