Skip to content

Commit 5adca75

Browse files
committed
drop shared parts of http4s backend to fix mdoc compilation bug
1 parent 56f1a37 commit 5adca75

7 files changed

Lines changed: 428 additions & 136 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,16 @@ jobs:
3737
if: matrix.target-platform == 'Native'
3838
run: |
3939
sudo apt-get update
40-
sudo apt-get install libidn2-dev libcurl3-dev
40+
sudo apt-get install libidn2-dev libcurl3-dev cmake libssl-dev
4141
echo "STTP_NATIVE=1" >> $GITHUB_ENV
42+
- name: Install s2n-tls
43+
if: matrix.target-platform == 'Native'
44+
run: |
45+
git clone https://github.com/aws/s2n-tls.git /tmp/s2n-tls
46+
cd /tmp/s2n-tls
47+
cmake . -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local
48+
cmake --build build -j $(nproc)
49+
sudo cmake --install build
4250
- name: Install scala-cli
4351
if: matrix.target-platform == 'JVM'
4452
uses: VirtusLab/scala-cli-setup@77834b5926f3eb70869d8009530c65585f7a039b # main, specifically v1.9.1
@@ -95,7 +103,14 @@ jobs:
95103
- name: Install libidn2-dev libcurl3-dev
96104
run: |
97105
sudo apt-get update
98-
sudo apt-get install libidn2-dev libcurl3-dev
106+
sudo apt-get install libidn2-dev libcurl3-dev cmake libssl-dev
107+
- name: Install s2n-tls
108+
run: |
109+
git clone https://github.com/aws/s2n-tls.git /tmp/s2n-tls
110+
cd /tmp/s2n-tls
111+
cmake . -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local
112+
cmake --build build -j $(nproc)
113+
sudo cmake --install build
99114
- name: Enable Native-specific modules
100115
if: matrix.java == '11'
101116
run: echo "STTP_NATIVE=1" >> $GITHUB_ENV

build.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -667,14 +667,16 @@ lazy val http4sBackend = (projectMatrix in file("http4s-backend"))
667667
name := "http4s-backend",
668668
libraryDependencies ++= Seq(
669669
"org.http4s" %%% "http4s-client" % http4s_ce3_version,
670-
"org.http4s" %%% "http4s-ember-client" % "0.23.34" % Optional
670+
"org.http4s" %%% "http4s-ember-client" % http4s_ce3_version % Optional
671671
),
672672
evictionErrorLevel := Level.Info
673673
)
674674
.jvmPlatform(
675675
scalaVersions = scala2And3,
676676
settings = commonJvmSettings ++ Seq(
677-
libraryDependencies += "org.http4s" %% "http4s-blaze-client" % "0.23.17" % Optional
677+
libraryDependencies ++= Seq(
678+
"org.http4s" %% "http4s-blaze-client" % "0.23.17" % Optional
679+
)
678680
)
679681
)
680682
.nativePlatform(

http4s-backend/src/main/scala/sttp/client4/http4s/Http4sBackendCompanion.scala

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)