Merge branch 'master' into update/zio-prelude-1.0.0-RC21

coralogix · Dec 23, 2023 · 9646500 · 9646500
2 parents 8251ff8 + 838fb78
commit 9646500
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
         uses: coursier/cache-action@v5
       - name: Build and test
         run: |
-          sbt ++2.12.17 clean scalafmtCheckAll test zio-k8s-crd/scripted docs/mdoc
+          sbt ++2.12.18 clean scalafmtCheckAll test zio-k8s-crd/scripted docs/mdoc
 
           rm -rf "$HOME/.ivy2/local" || true
           find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
@@ -37,7 +37,7 @@ jobs:
         uses: coursier/cache-action@v5
       - name: Build and test
         run: |
-          sbt ++2.13.11 clean scalafmtCheckAll zio-k8s-client/test zio-k8s-operator/test examples/compile
+          sbt ++2.13.12 clean scalafmtCheckAll zio-k8s-client/test zio-k8s-operator/test examples/compile
       
           rm -rf "$HOME/.ivy2/local" || true
           find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
@@ -58,7 +58,7 @@ jobs:
         uses: coursier/cache-action@v5
       - name: Build and test
         run: |
-          sbt ++3.3.0 clean zio-k8s-client/test zio-k8s-operator/test leader-example/compile logs-example/compile
+          sbt ++3.3.1 clean zio-k8s-client/test zio-k8s-operator/test leader-example/compile logs-example/compile
 
           rm -rf "$HOME/.ivy2/local" || true
           find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true

diff --git a/build.sbt b/build.sbt
@@ -1,11 +1,11 @@
 val scala212Version = "2.12.18"
-val scala213Version = "2.13.11"
+val scala213Version = "2.13.12"
 val scala3Version = "3.3.1"
 
 val zioVersion = "2.0.15"
 val zioConfigVersion = "4.0.0-RC16"
 val zioLoggingVersion = "2.1.13"
-val sttpVersion = "3.8.16"
+val sttpVersion = "3.9.1"
 val zioNioVersion = "2.0.2"
 val zioPreludeVersion = "1.0.0-RC21"
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.9.2
+sbt.version = 1.9.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 addSbtPlugin("org.scalameta"                     % "sbt-scalafmt"        % "2.5.2")
 addSbtPlugin("com.github.sbt"                    % "sbt-ci-release"      % "1.5.11")
 addSbtPlugin("com.github.sbt"                    % "sbt-native-packager" % "1.9.16")
-addSbtPlugin("org.scalameta"                     % "sbt-mdoc"            % "2.3.7")
+addSbtPlugin("org.scalameta"                     % "sbt-mdoc"            % "2.3.8")
 addSbtPlugin("com.github.sbt"                    % "sbt-unidoc"          % "0.5.0")
 addSbtPlugin("com.eed3si9n"                      % "sbt-buildinfo"       % "0.11.0")
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings"    % "3.0.2")

diff --git a/...s-operator/src/test/scala/com/coralogix/zio/k8s/operator/leader/locks/LeaseLockSpec.scala b/...s-operator/src/test/scala/com/coralogix/zio/k8s/operator/leader/locks/LeaseLockSpec.scala
@@ -14,7 +14,7 @@ import zio.ZIO.{ ifZIO, logDebug, logInfo }
 import zio.logging.LogFormat
 import zio.stream.ZStream
 import zio.test.Assertion._
-import zio.test.TestAspect.timeout
+import zio.test.TestAspect.{ flaky, timeout }
 import zio.test._
 import zio.{ stream, Clock, Fiber, IO, RIO, Ref, UIO, ULayer, ZIO, ZLayer, _ }
 
@@ -248,13 +248,13 @@ object LeaseLockSpec extends ZIOSpecDefault {
 
   override def spec: Spec[TestEnvironment, Any] =
     suite("Lease based leader election")(
-//      simultaneousStartupSingleLeaderTest,
-//      newLeaderAfterInterruptionTest,
-//      stolenLeaseInterruptionTest,
-//      noK8sAccessTest,
-      clockSkewTest
-//      renewalFailure
-    ) @@ timeout(30.second)
+      simultaneousStartupSingleLeaderTest,
+      newLeaderAfterInterruptionTest,
+      stolenLeaseInterruptionTest,
+      noK8sAccessTest,
+      clockSkewTest,
+      renewalFailure
+    ) @@ flaky @@ timeout(2.minutes) // TODO: investigate why this test is flaky on CI
 
   val simultaneousStartupSingleLeaderTest: Spec[TestEnvironment, Any] =
     test("simultaneous startup, only one leads") {