Skip to content

Commit 29ce898

Browse files
committed
Drop native and upgrade scalapb
Since we are stuck on 0.4 and the world have moved on. We have not published anything yet, so that means we have no real problem with not publishing navtive bindings.
1 parent aecbff6 commit 29ce898

File tree

3 files changed

+6
-39
lines changed

3 files changed

+6
-39
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
os: [ubuntu-22.04]
3232
scala: [2.13, 3]
3333
java: [temurin@8, temurin@11, temurin@17]
34-
project: [http4s-grpcJVM, http4s-grpcJS, http4s-grpcNative]
34+
project: [http4s-grpcJVM, http4s-grpcJS]
3535
exclude:
3636
- scala: 3
3737
java: temurin@11
@@ -41,10 +41,6 @@ jobs:
4141
java: temurin@11
4242
- project: http4s-grpcJS
4343
java: temurin@17
44-
- project: http4s-grpcNative
45-
java: temurin@11
46-
- project: http4s-grpcNative
47-
java: temurin@17
4844
runs-on: ${{ matrix.os }}
4945
timeout-minutes: 60
5046
steps:
@@ -106,10 +102,6 @@ jobs:
106102
if: matrix.project == 'http4s-grpcJS'
107103
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult
108104

109-
- name: nativeLink
110-
if: matrix.project == 'http4s-grpcNative'
111-
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink
112-
113105
- name: Test
114106
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
115107

@@ -131,11 +123,11 @@ jobs:
131123

132124
- name: Make target directories
133125
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
134-
run: mkdir -p core/.native/target core/.js/target codegen/plugin/target core/.jvm/target codegen/generator/target project/target
126+
run: mkdir -p core/.js/target codegen/plugin/target core/.jvm/target codegen/generator/target project/target
135127

136128
- name: Compress target directories
137129
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
138-
run: tar cf targets.tar core/.native/target core/.js/target codegen/plugin/target core/.jvm/target codegen/generator/target project/target
130+
run: tar cf targets.tar core/.js/target codegen/plugin/target core/.jvm/target codegen/generator/target project/target
139131

140132
- name: Upload target directories
141133
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -221,16 +213,6 @@ jobs:
221213
tar xf targets.tar
222214
rm targets.tar
223215
224-
- name: Download target directories (2.13, http4s-grpcNative)
225-
uses: actions/download-artifact@v4
226-
with:
227-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-http4s-grpcNative
228-
229-
- name: Inflate target directories (2.13, http4s-grpcNative)
230-
run: |
231-
tar xf targets.tar
232-
rm targets.tar
233-
234216
- name: Download target directories (3, http4s-grpcJVM)
235217
uses: actions/download-artifact@v4
236218
with:
@@ -251,16 +233,6 @@ jobs:
251233
tar xf targets.tar
252234
rm targets.tar
253235
254-
- name: Download target directories (3, http4s-grpcNative)
255-
uses: actions/download-artifact@v4
256-
with:
257-
name: target-${{ matrix.os }}-${{ matrix.java }}-3-http4s-grpcNative
258-
259-
- name: Inflate target directories (3, http4s-grpcNative)
260-
run: |
261-
tar xf targets.tar
262-
rm targets.tar
263-
264236
- name: Import signing key
265237
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
266238
env:

build.sbt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ ThisBuild / developers := List(
77
tlGitHubDev("christopherdavenport", "Christopher Davenport")
88
)
99
ThisBuild / tlCiReleaseBranches := Seq("main")
10-
ThisBuild / tlSonatypeUseLegacyHost := false
11-
1210
ThisBuild / tlMimaPreviousVersions := Set()
1311

1412
val Scala212 = "2.12.20"
@@ -38,7 +36,7 @@ lazy val `http4s-grpc` = tlCrossRootProject
3836
)
3937
.disablePlugins(HeaderPlugin)
4038

41-
lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
39+
lazy val core = crossProject(JVMPlatform, JSPlatform)
4240
.crossType(CrossType.Pure)
4341
.in(file("core"))
4442
.settings(
@@ -102,7 +100,7 @@ lazy val codeGeneratorPlugin = project
102100
)
103101
.disablePlugins(HeaderPlugin, ScalafixPlugin)
104102

105-
lazy val codeGeneratorTesting = crossProject(JVMPlatform, JSPlatform, NativePlatform)
103+
lazy val codeGeneratorTesting = crossProject(JVMPlatform, JSPlatform)
106104
.crossType(CrossType.Pure)
107105
.in(file("codegen/testing"))
108106
.enablePlugins(LocalCodeGenPlugin, BuildInfoPlugin, NoPublishPlugin)

project/plugins.sbt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.17.6")
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
3-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
4-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
5-
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
63
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
74

85
addSbtPlugin(
96
"com.thesamet" % "sbt-protoc" % "1.0.7"
107
) // Because sbt-protoc-gen-project brings in 1.0.4
118
addSbtPlugin("com.thesamet" % "sbt-protoc-gen-project" % "0.1.8")
12-
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.14"
9+
libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.17"

0 commit comments

Comments
 (0)