Skip to content

Commit 234272e

Browse files
hnaderihnaderi
committed
Updated all dependencies, disabled http4s native
1 parent e233f04 commit 234272e

File tree

4 files changed

+52
-43
lines changed

4 files changed

+52
-43
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ jobs:
106106

107107
- name: Make target directories
108108
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
109-
run: mkdir -p modules/http4s-ember/.jvm/target modules/json4s/.js/target modules/http4s-ember/.js/target modules/http4s/.jvm/target modules/http4s/.js/target modules/circe/.jvm/target modules/scalacheck/.native/target modules/client/.native/target unidocs/target modules/sttp/.native/target modules/client/.js/target modules/json4s/.native/target modules/jawn/.jvm/target modules/http4s-netty/.jvm/target modules/client/.jvm/target modules/manifests/.js/target modules/circe/.js/target modules/objects/.js/target modules/objects/.jvm/target modules/jawn/.js/target modules/spray-json/.jvm/target modules/play-json/.jvm/target modules/zio/.jvm/target modules/manifests/.jvm/target modules/http4s-blaze/.jvm/target modules/sttp/.js/target modules/http4s/.native/target modules/sttp/.jvm/target modules/http4s-jdk/.jvm/target modules/jawn/.native/target modules/circe/.native/target modules/zio-json/.js/target modules/objects/.native/target modules/json4s/.jvm/target modules/scalacheck/.jvm/target modules/zio-json/.jvm/target modules/java-ssl/.jvm/target modules/http4s-ember/.native/target modules/manifests/.native/target modules/scalacheck/.js/target project/target
109+
run: mkdir -p modules/http4s-ember/.jvm/target modules/json4s/.js/target modules/http4s-ember/.js/target modules/http4s/.jvm/target modules/http4s/.js/target modules/circe/.jvm/target modules/scalacheck/.native/target modules/client/.native/target unidocs/target modules/sttp/.native/target modules/client/.js/target modules/json4s/.native/target modules/jawn/.jvm/target modules/http4s-netty/.jvm/target modules/client/.jvm/target modules/manifests/.js/target modules/circe/.js/target modules/objects/.js/target modules/objects/.jvm/target modules/jawn/.js/target modules/spray-json/.jvm/target modules/play-json/.jvm/target modules/zio/.jvm/target modules/manifests/.jvm/target modules/http4s-blaze/.jvm/target modules/sttp/.js/target modules/sttp/.jvm/target modules/http4s-jdk/.jvm/target modules/jawn/.native/target modules/circe/.native/target modules/zio-json/.js/target modules/objects/.native/target modules/json4s/.jvm/target modules/scalacheck/.jvm/target modules/zio-json/.jvm/target modules/java-ssl/.jvm/target modules/manifests/.native/target modules/scalacheck/.js/target project/target
110110

111111
- name: Compress target directories
112112
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
113-
run: tar cf targets.tar modules/http4s-ember/.jvm/target modules/json4s/.js/target modules/http4s-ember/.js/target modules/http4s/.jvm/target modules/http4s/.js/target modules/circe/.jvm/target modules/scalacheck/.native/target modules/client/.native/target unidocs/target modules/sttp/.native/target modules/client/.js/target modules/json4s/.native/target modules/jawn/.jvm/target modules/http4s-netty/.jvm/target modules/client/.jvm/target modules/manifests/.js/target modules/circe/.js/target modules/objects/.js/target modules/objects/.jvm/target modules/jawn/.js/target modules/spray-json/.jvm/target modules/play-json/.jvm/target modules/zio/.jvm/target modules/manifests/.jvm/target modules/http4s-blaze/.jvm/target modules/sttp/.js/target modules/http4s/.native/target modules/sttp/.jvm/target modules/http4s-jdk/.jvm/target modules/jawn/.native/target modules/circe/.native/target modules/zio-json/.js/target modules/objects/.native/target modules/json4s/.jvm/target modules/scalacheck/.jvm/target modules/zio-json/.jvm/target modules/java-ssl/.jvm/target modules/http4s-ember/.native/target modules/manifests/.native/target modules/scalacheck/.js/target project/target
113+
run: tar cf targets.tar modules/http4s-ember/.jvm/target modules/json4s/.js/target modules/http4s-ember/.js/target modules/http4s/.jvm/target modules/http4s/.js/target modules/circe/.jvm/target modules/scalacheck/.native/target modules/client/.native/target unidocs/target modules/sttp/.native/target modules/client/.js/target modules/json4s/.native/target modules/jawn/.jvm/target modules/http4s-netty/.jvm/target modules/client/.jvm/target modules/manifests/.js/target modules/circe/.js/target modules/objects/.js/target modules/objects/.jvm/target modules/jawn/.js/target modules/spray-json/.jvm/target modules/play-json/.jvm/target modules/zio/.jvm/target modules/manifests/.jvm/target modules/http4s-blaze/.jvm/target modules/sttp/.js/target modules/sttp/.jvm/target modules/http4s-jdk/.jvm/target modules/jawn/.native/target modules/circe/.native/target modules/zio-json/.js/target modules/objects/.native/target modules/json4s/.jvm/target modules/scalacheck/.jvm/target modules/zio-json/.jvm/target modules/java-ssl/.jvm/target modules/manifests/.native/target modules/scalacheck/.js/target project/target
114114

115115
- name: Upload target directories
116116
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
117-
uses: actions/upload-artifact@v4
117+
uses: actions/upload-artifact@v5
118118
with:
119119
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
120120
path: targets.tar
@@ -164,7 +164,7 @@ jobs:
164164
run: sbt +update
165165

166166
- name: Download target directories (2.12, rootJS)
167-
uses: actions/download-artifact@v4
167+
uses: actions/download-artifact@v6
168168
with:
169169
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
170170

@@ -174,7 +174,7 @@ jobs:
174174
rm targets.tar
175175
176176
- name: Download target directories (2.12, rootJVM)
177-
uses: actions/download-artifact@v4
177+
uses: actions/download-artifact@v6
178178
with:
179179
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
180180

@@ -184,7 +184,7 @@ jobs:
184184
rm targets.tar
185185
186186
- name: Download target directories (2.12, rootNative)
187-
uses: actions/download-artifact@v4
187+
uses: actions/download-artifact@v6
188188
with:
189189
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
190190

@@ -194,7 +194,7 @@ jobs:
194194
rm targets.tar
195195
196196
- name: Download target directories (2.13, rootJS)
197-
uses: actions/download-artifact@v4
197+
uses: actions/download-artifact@v6
198198
with:
199199
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
200200

@@ -204,7 +204,7 @@ jobs:
204204
rm targets.tar
205205
206206
- name: Download target directories (2.13, rootJVM)
207-
uses: actions/download-artifact@v4
207+
uses: actions/download-artifact@v6
208208
with:
209209
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
210210

@@ -214,7 +214,7 @@ jobs:
214214
rm targets.tar
215215
216216
- name: Download target directories (2.13, rootNative)
217-
uses: actions/download-artifact@v4
217+
uses: actions/download-artifact@v6
218218
with:
219219
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative
220220

@@ -224,7 +224,7 @@ jobs:
224224
rm targets.tar
225225
226226
- name: Download target directories (3, rootJS)
227-
uses: actions/download-artifact@v4
227+
uses: actions/download-artifact@v6
228228
with:
229229
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
230230

@@ -234,7 +234,7 @@ jobs:
234234
rm targets.tar
235235
236236
- name: Download target directories (3, rootJVM)
237-
uses: actions/download-artifact@v4
237+
uses: actions/download-artifact@v6
238238
with:
239239
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
240240

@@ -244,7 +244,7 @@ jobs:
244244
rm targets.tar
245245
246246
- name: Download target directories (3, rootNative)
247-
uses: actions/download-artifact@v4
247+
uses: actions/download-artifact@v6
248248
with:
249249
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
250250

@@ -323,7 +323,7 @@ jobs:
323323
- name: Submit Dependencies
324324
uses: scalacenter/sbt-dependency-submission@v2
325325
with:
326-
modules-ignore: scala-k8s-client-test_sjs1_2.12 scala-k8s-client-test_sjs1_2.13 scala-k8s-client-test_sjs1_3 scala-k8s-client-test_2.12 scala-k8s-client-test_2.13 scala-k8s-client-test_3 scala-k8s_2.12 scala-k8s_2.13 scala-k8s_3 docs_2.12 docs_2.13 docs_3 scala-k8s-example-cross-platform_sjs1_2.12 scala-k8s-example-cross-platform_sjs1_2.13 scala-k8s-example-cross-platform_sjs1_3 scala-k8s-codec-test_2.12 scala-k8s-codec-test_2.13 scala-k8s-codec-test_3 scala-k8s-objects-test_sjs1_2.12 scala-k8s-objects-test_sjs1_2.13 scala-k8s-objects-test_sjs1_3 scala-k8s-codec-test_native0.4_2.12 scala-k8s-codec-test_native0.4_2.13 scala-k8s-codec-test_native0.4_3 scala-k8s-example-jvm_2.12 scala-k8s-example-jvm_2.13 scala-k8s-example-jvm_3 scala-k8s-codec-test_sjs1_2.12 scala-k8s-codec-test_sjs1_2.13 scala-k8s-codec-test_sjs1_3 scala-k8s-example-cross-platform_native0.4_2.12 scala-k8s-example-cross-platform_native0.4_2.13 scala-k8s-example-cross-platform_native0.4_3 scala-k8s_2.12 scala-k8s_2.13 scala-k8s_3 scala-k8s_2.12 scala-k8s_2.13 scala-k8s_3 scala-k8s-objects-test_2.12 scala-k8s-objects-test_2.13 scala-k8s-objects-test_3 scala-k8s-example-cross-platform_2.12 scala-k8s-example-cross-platform_2.13 scala-k8s-example-cross-platform_3
326+
modules-ignore: scala-k8s-client-test_sjs1_2.12 scala-k8s-client-test_sjs1_2.13 scala-k8s-client-test_sjs1_3 scala-k8s-client-test_2.12 scala-k8s-client-test_2.13 scala-k8s-client-test_3 scala-k8s_2.12 scala-k8s_2.13 scala-k8s_3 docs_2.12 docs_2.13 docs_3 scala-k8s-example-cross-platform_sjs1_2.12 scala-k8s-example-cross-platform_sjs1_2.13 scala-k8s-example-cross-platform_sjs1_3 scala-k8s-codec-test_2.12 scala-k8s-codec-test_2.13 scala-k8s-codec-test_3 scala-k8s-objects-test_sjs1_2.12 scala-k8s-objects-test_sjs1_2.13 scala-k8s-objects-test_sjs1_3 scala-k8s-codec-test_native0.5_2.12 scala-k8s-codec-test_native0.5_2.13 scala-k8s-codec-test_native0.5_3 scala-k8s-example-jvm_2.12 scala-k8s-example-jvm_2.13 scala-k8s-example-jvm_3 scala-k8s-codec-test_sjs1_2.12 scala-k8s-codec-test_sjs1_2.13 scala-k8s-codec-test_sjs1_3 scala-k8s_2.12 scala-k8s_2.13 scala-k8s_3 scala-k8s_2.12 scala-k8s_2.13 scala-k8s_3 scala-k8s-objects-test_2.12 scala-k8s-objects-test_2.13 scala-k8s-objects-test_3 scala-k8s-example-cross-platform_2.12 scala-k8s-example-cross-platform_2.13 scala-k8s-example-cross-platform_3
327327
configs-ignore: test scala-tool scala-doc-tool test-internal
328328

329329
validate-steward:

‎build.sbt‎

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import dev.hnaderi.k8s.generator.KubernetesJsonPointerGeneratorPlugin
22
import dev.hnaderi.k8s.generator.KubernetesScalacheckGeneratorPlugin
33
import sbtcrossproject.CrossProject
44

5-
ThisBuild / tlBaseVersion := "0.25"
5+
ThisBuild / tlBaseVersion := "0.26"
66

77
ThisBuild / organization := "dev.hnaderi"
88
ThisBuild / organizationName := "Hossein Naderi"
@@ -13,7 +13,7 @@ ThisBuild / developers := List(
1313
)
1414

1515
val scala212 = "2.12.20"
16-
val scala213 = "2.13.16"
16+
val scala213 = "2.13.18"
1717
val scala3 = "3.3.7"
1818
val PrimaryJava = JavaSpec.temurin("11")
1919
val LTSJava = JavaSpec.temurin("17")
@@ -79,8 +79,8 @@ lazy val root =
7979
name := "scala-k8s"
8080
)
8181

82-
lazy val circeVersion = "0.14.8"
83-
lazy val munitVersion = "1.0.0-M11"
82+
lazy val circeVersion = "0.14.15"
83+
lazy val munitVersion = "1.2.0"
8484

8585
val rootDir = Def.setting((ThisBuild / baseDirectory).value)
8686

@@ -138,25 +138,31 @@ lazy val javaSSL = module("java-ssl") {
138138
}
139139

140140
lazy val http4s = module("http4s") {
141-
crossProject(JVMPlatform, JSPlatform, NativePlatform)
141+
crossProject(
142+
JVMPlatform,
143+
JSPlatform // ,NativePlatform TODO enable after typelevel adopted
144+
)
142145
.crossType(CrossType.Pure)
143146
.settings(
144147
description := "http4s based client for kubernetes",
145148
libraryDependencies ++= Seq(
146-
"org.http4s" %%% "http4s-client" % "0.23.30"
149+
"org.http4s" %%% "http4s-client" % "0.23.33"
147150
)
148151
)
149152
.dependsOn(client, jawn)
150153
.jvmConfigure(_.dependsOn(javaSSL.jvm))
151154
}
152155

153156
lazy val http4sEmber = module("http4s-ember") {
154-
crossProject(JVMPlatform, JSPlatform, NativePlatform)
157+
crossProject(
158+
JVMPlatform,
159+
JSPlatform // , NativePlatform
160+
)
155161
.crossType(CrossType.Pure)
156162
.settings(
157163
description := "http4s ember based client for kubernetes",
158164
libraryDependencies ++= Seq(
159-
"org.http4s" %%% "http4s-ember-client" % "0.23.30"
165+
"org.http4s" %%% "http4s-ember-client" % "0.23.33"
160166
)
161167
)
162168
.dependsOn(http4s)
@@ -167,7 +173,7 @@ lazy val http4sNetty = module("http4s-netty") {
167173
.settings(
168174
description := "http4s netty based client for kubernetes",
169175
libraryDependencies ++= Seq(
170-
"org.http4s" %% "http4s-netty-client" % "0.5.25"
176+
"org.http4s" %% "http4s-netty-client" % "0.5.26"
171177
)
172178
)
173179
.dependsOn(http4s)
@@ -202,7 +208,7 @@ lazy val sttp = module("sttp") {
202208
.settings(
203209
description := "sttp based client for kubernetes",
204210
libraryDependencies ++= Seq(
205-
"com.softwaremill.sttp.client3" %%% "core" % "3.9.8"
211+
"com.softwaremill.sttp.client3" %%% "core" % "3.11.0"
206212
)
207213
)
208214
.dependsOn(client, jawn)
@@ -215,8 +221,8 @@ lazy val zio = module("zio") {
215221
.settings(
216222
description := "zio-http based client for kubernetes",
217223
libraryDependencies ++= Seq(
218-
"dev.zio" %% "zio-http" % "3.0.0-RC4",
219-
"dev.zio" %%% "zio-json" % "0.6.2"
224+
"dev.zio" %% "zio-http" % "3.0.1",
225+
"dev.zio" %%% "zio-json" % "0.7.45"
220226
)
221227
)
222228
.dependsOn(client, `zio-json`)
@@ -229,7 +235,7 @@ lazy val scalacheck = module("scalacheck") {
229235
description := "scalacheck generators for kubernetes data models",
230236
k8sUnmanagedTarget := rootDir.value / "modules" / "scalacheck" / "src" / "main" / "scala",
231237
libraryDependencies ++= Seq(
232-
"org.scalacheck" %%% "scalacheck" % "1.17.1"
238+
"org.scalacheck" %%% "scalacheck" % "1.19.0"
233239
)
234240
)
235241
.dependsOn(objects)
@@ -309,7 +315,7 @@ lazy val `play-json` = module("play-json") {
309315
.settings(
310316
description := "play-json codecs for kubernetes data models",
311317
libraryDependencies ++= Seq(
312-
("org.playframework" %%% "play-json" % "3.0.4")
318+
("org.playframework" %%% "play-json" % "3.0.6")
313319
.cross(CrossVersion.for3Use2_13)
314320
)
315321
)
@@ -336,7 +342,7 @@ lazy val `zio-json` = module("zio-json") {
336342
.settings(
337343
description := "zio-json codecs for kubernetes data models",
338344
libraryDependencies ++= Seq(
339-
"dev.zio" %%% "zio-json" % "0.6.2"
345+
"dev.zio" %%% "zio-json" % "0.7.45"
340346
)
341347
)
342348
.dependsOn(objects)
@@ -349,7 +355,7 @@ lazy val jawn = module("jawn") {
349355
.settings(
350356
description := "jawn facade for kubernetes data models parsing",
351357
libraryDependencies ++= Seq(
352-
"org.typelevel" %%% "jawn-parser" % "1.5.1"
358+
"org.typelevel" %%% "jawn-parser" % "1.6.0"
353359
)
354360
)
355361
.dependsOn(objects)
@@ -361,7 +367,7 @@ lazy val manifests = module("manifests") {
361367
.settings(
362368
description := "kubernetes manifests utilities",
363369
libraryDependencies ++= Seq(
364-
"dev.hnaderi" %%% "yaml4s-backend" % "0.2.2"
370+
"dev.hnaderi" %%% "yaml4s-backend" % "0.3.2"
365371
)
366372
)
367373
.dependsOn(objects)
@@ -373,7 +379,7 @@ lazy val docs = project
373379
.enablePlugins(ScalaK8sWebsite)
374380
.settings(
375381
libraryDependencies ++= Seq(
376-
"org.http4s" %%% "http4s-circe" % "0.23.30",
382+
"org.http4s" %%% "http4s-circe" % "0.23.33",
377383
"com.softwaremill.sttp.client3" %%% "circe" % "3.11.0"
378384
)
379385
)
@@ -411,19 +417,22 @@ lazy val exampleJVM = example("jvm") {
411417
.crossType(CrossType.Pure)
412418
.settings(
413419
libraryDependencies ++= Seq(
414-
"org.http4s" %%% "http4s-circe" % "0.23.30",
420+
"org.http4s" %%% "http4s-circe" % "0.23.33",
415421
"com.softwaremill.sttp.client3" %%% "circe" % "3.11.0"
416422
)
417423
)
418424
.dependsOn(http4sNetty, http4sEmber, circe, zio, sttp)
419425
}
420426

421427
lazy val exampleCrossPlatform = example("cross-platform") {
422-
crossProject(JVMPlatform, JSPlatform, NativePlatform)
428+
crossProject(
429+
JVMPlatform,
430+
JSPlatform // , NativePlatform
431+
)
423432
.crossType(CrossType.Pure)
424433
.settings(
425434
libraryDependencies ++= Seq(
426-
"org.http4s" %%% "http4s-circe" % "0.23.30"
435+
"org.http4s" %%% "http4s-circe" % "0.23.33"
427436
)
428437
)
429438
.jsSettings(
@@ -433,10 +442,10 @@ lazy val exampleCrossPlatform = example("cross-platform") {
433442
// scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.ESModule) }
434443
)
435444
.jsConfigure(_.enablePlugins(ScalaJSBundlerPlugin))
436-
.nativeSettings(
437-
libraryDependencies += "com.armanbilge" %%% "epollcat" % "0.1.6",
438-
envVars ++= Map("S2N_DONT_MLOCK" -> "1")
439-
)
445+
// .nativeSettings(
446+
// libraryDependencies += "com.armanbilge" %%% "epollcat" % "0.1.6",
447+
// envVars ++= Map("S2N_DONT_MLOCK" -> "1")
448+
// )
440449
.dependsOn(http4sEmber, circe)
441450
}
442451

‎modules/zio/src/main/scala/ZIOBackend.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ final case class ZIOBackend(
112112
case Some(value) => qs.updated(k, Chunk(v) ++ value)
113113
}
114114
}
115-
} yield u.queryParams(qp)
115+
} yield u.setQueryParams(QueryParams(qp))
116116

117117
private def expect[O: Decoder](req: http.Request): ScopedTask[O] =
118118
client.request(req).flatMap { res =>

‎project/plugins.sbt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.2")
2-
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.2")
1+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.3")
2+
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.8.3")
33
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
44
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
5-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
6-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
5+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
6+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9")
77
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
88
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")

0 commit comments

Comments
 (0)