Skip to content

Commit ad6f1a2

Browse files
committed
Use temporal-shaded to avoid protobuf version mismatch
Signed-off-by: Felipe Cortez <github@felipecortez.net>
1 parent bd96fb6 commit ad6f1a2

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

project.clj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
[lein-codox "0.10.8"]]
1414
:dependencies [[org.clojure/clojure "1.12.0"]
1515
[org.clojure/core.async "1.7.701"]
16-
[io.temporal/temporal-sdk "1.28.3"]
17-
[io.temporal/temporal-testing "1.28.3"]
16+
[io.temporal/temporal-shaded "1.32.0"]
1817
[com.taoensso/encore "3.139.0"]
1918
[com.taoensso/timbre "6.6.1"]
2019
[com.taoensso/nippy "3.4.2"]

src/temporal/codec.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(:import [io.temporal.common.converter DefaultDataConverter CodecDataConverter]
99
[io.temporal.payload.codec PayloadCodec]
1010
[io.temporal.api.common.v1 Payload]
11-
[com.google.protobuf ByteString]
11+
[io.temporal.shaded.com.google.protobuf ByteString]
1212
[java.util Collections]))
1313

1414
(defprotocol Codec

src/temporal/tls.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
(:import [java.security KeyStore]
77
[java.security.cert CertificateFactory X509Certificate]
88
[javax.net.ssl TrustManagerFactory]
9-
[io.grpc.netty.shaded.io.grpc.netty GrpcSslContexts]
10-
[io.grpc.netty.shaded.io.netty.handler.ssl SslContext]))
9+
[io.temporal.shaded.io.grpc.netty.shaded.io.grpc.netty GrpcSslContexts]
10+
[io.temporal.shaded.io.grpc.netty.shaded.io.netty.handler.ssl SslContext]))
1111

1212
(defn- new-ca
1313
^X509Certificate [certpath]

test/temporal/test/types.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
[temporal.internal.schedule :as s]
99
[temporal.internal.child-workflow :as cw])
1010
(:import [java.time Duration Instant]
11-
[io.grpc Grpc InsecureChannelCredentials Metadata]
12-
[io.grpc.netty.shaded.io.grpc.netty GrpcSslContexts]))
11+
[io.temporal.shaded.io.grpc Grpc InsecureChannelCredentials Metadata]
12+
[io.temporal.shaded.io.grpc.netty.shaded.io.grpc.netty GrpcSslContexts]))
1313

1414
(deftest workflow-options
1515
(testing "Verify that our workflow options work"

0 commit comments

Comments
 (0)