Merge branch 'main' into feat/sbt-dependency-submission

hyperledger · Oct 23, 2024 · ee3c29d · ee3c29d
2 parents 142ed4a + b6a895b
commit ee3c29d
Show file tree

Hide file tree

Showing 97 changed files with 3,309 additions and 1,133 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: MegaLinter
         id: ml
-        uses: oxsecurity/megalinter@v7.1.0
+        uses: oxsecurity/megalinter@v8
 
       - name: Archive production artifacts
         if: success() || failure()

diff --git a/.mega-linter.yml b/.mega-linter.yml
@@ -12,6 +12,7 @@ DISABLE_LINTERS:
   - REPOSITORY_CHECKOV
   - REPOSITORY_SECRETLINT
   - REPOSITORY_KICS
+  - REPOSITORY_GRYPE
   - SCALA_SCALAFIX
   - SQL_TSQLLINT
   - C_CPPLINT # For pollux/lib/anoncreds/src/main/c
@@ -30,6 +31,7 @@ DISABLE_LINTERS:
 
 DISABLE_ERRORS_LINTERS:
   - KOTLIN_KTLINT
+  - KOTLIN_DETEKT
   - PROTOBUF_PROTOLINT
   - MARKDOWN_MARKDOWN_LINK_CHECK
   - ACTION_ACTIONLINT

diff --git a/build.sbt b/build.sbt
@@ -36,7 +36,8 @@ inThisBuild(
     // scalacOptions += "-Yexplicit-nulls",
     // scalacOptions += "-Ysafe-init",
     // scalacOptions +=  "-Werror", // <=> "-Xfatal-warnings"
-    scalacOptions += "-Dquill.macro.log=false", // disable quill macro logs // TODO https://github.com/zio/zio-protoquill/issues/470
+    scalacOptions += "-Dquill.macro.log=false", // disable quill macro logs // TODO https://github.com/zio/zio-protoquill/issues/470,
+    scalacOptions ++= Seq("-Xmax-inlines", "50") // manually increase max-inlines above 32 (https://github.com/circe/circe/issues/2162)
   )
 )
 
@@ -53,6 +54,7 @@ lazy val V = new {
   val zioCatsInterop = "3.3.0" // TODO "23.1.0.2" // https://mvnrepository.com/artifact/dev.zio/zio-interop-cats
   val zioMetricsConnector = "2.3.1"
   val zioMock = "1.0.0-RC12"
+  val zioKafka = "2.7.5"
   val mockito = "3.2.18.0"
   val monocle = "3.2.0"
 
@@ -102,7 +104,11 @@ lazy val D = new {
   val zioLog: ModuleID = "dev.zio" %% "zio-logging" % V.zioLogging
   val zioSLF4J: ModuleID = "dev.zio" %% "zio-logging-slf4j" % V.zioLogging
   val zioJson: ModuleID = "dev.zio" %% "zio-json" % V.zioJson
+  val zioConcurrent: ModuleID = "dev.zio" %% "zio-concurrent" % V.zio
   val zioHttp: ModuleID = "dev.zio" %% "zio-http" % V.zioHttp
+  val zioKafka: ModuleID = "dev.zio" %% "zio-kafka" % V.zioKafka excludeAll (
+    ExclusionRule("dev.zio", "zio_3"), ExclusionRule("dev.zio", "zio-streams_3")
+  )
   val zioCatsInterop: ModuleID = "dev.zio" %% "zio-interop-cats" % V.zioCatsInterop
   val zioMetricsConnectorMicrometer: ModuleID = "dev.zio" %% "zio-metrics-connectors-micrometer" % V.zioMetricsConnector
   val tapirPrometheusMetrics: ModuleID = "com.softwaremill.sttp.tapir" %% "tapir-prometheus-metrics" % V.tapir
@@ -185,7 +191,9 @@ lazy val D_Shared = new {
       D.typesafeConfig,
       D.scalaPbGrpc,
       D.zio,
+      D.zioConcurrent,
       D.zioHttp,
+      D.zioKafka,
       D.scalaUri,
       D.zioPrelude,
       // FIXME: split shared DB stuff as subproject?
@@ -341,12 +349,11 @@ lazy val D_Pollux_VC_JWT = new {
 
 lazy val D_EventNotification = new {
   val zio = "dev.zio" %% "zio" % V.zio
-  val zioConcurrent = "dev.zio" %% "zio-concurrent" % V.zio
   val zioTest = "dev.zio" %% "zio-test" % V.zio % Test
   val zioTestSbt = "dev.zio" %% "zio-test-sbt" % V.zio % Test
   val zioTestMagnolia = "dev.zio" %% "zio-test-magnolia" % V.zio % Test
 
-  val zioDependencies: Seq[ModuleID] = Seq(zio, zioConcurrent, zioTest, zioTestSbt, zioTestMagnolia)
+  val zioDependencies: Seq[ModuleID] = Seq(zio, zioTest, zioTestSbt, zioTestMagnolia)
   val baseDependencies: Seq[ModuleID] = zioDependencies
 }
 

diff --git a/cloud-agent/client/generator/openapitools.json b/cloud-agent/client/generator/openapitools.json
@@ -2,6 +2,6 @@
   "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "7.4.0"
+    "version": "7.7.0"
   }
 }
diff --git a/cloud-agent/client/generator/package.json b/cloud-agent/client/generator/package.json
@@ -13,7 +13,7 @@
     "publish:clients": "./publish-clients.sh"
   },
   "dependencies": {
-    "@openapitools/openapi-generator-cli": "2.7.0",
+    "@openapitools/openapi-generator-cli": "2.13.13",
     "npm-run-all": "^4.1.5"
   }
 }