Skip to content

Use temporal-shaded to avoid protobuf version mismatch #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use temporal-shaded to avoid protobuf version mismatch #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
[lein-codox "0.10.8"]]
:dependencies [[org.clojure/clojure "1.12.0"]
[org.clojure/core.async "1.7.701"]
[io.temporal/temporal-sdk "1.28.3"]
[io.temporal/temporal-testing "1.28.3"]
[io.temporal/temporal-shaded "1.28.3"]
[com.taoensso/encore "3.139.0"]
[com.taoensso/timbre "6.6.1"]
[com.taoensso/nippy "3.4.2"]
Expand Down
2 changes: 1 addition & 1 deletion src/temporal/codec.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
(:import [io.temporal.common.converter DefaultDataConverter CodecDataConverter]
[io.temporal.payload.codec PayloadCodec]
[io.temporal.api.common.v1 Payload]
[com.google.protobuf ByteString]
[io.temporal.shaded.com.google.protobuf ByteString]
[java.util Collections]))

(defprotocol Codec
Expand Down
4 changes: 2 additions & 2 deletions src/temporal/tls.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
(:import [java.security KeyStore]
[java.security.cert CertificateFactory X509Certificate]
[javax.net.ssl TrustManagerFactory]
[io.grpc.netty.shaded.io.grpc.netty GrpcSslContexts]
[io.grpc.netty.shaded.io.netty.handler.ssl SslContext]))
[io.temporal.shaded.io.grpc.netty.shaded.io.grpc.netty GrpcSslContexts]
[io.temporal.shaded.io.grpc.netty.shaded.io.netty.handler.ssl SslContext]))

(defn- new-ca
^X509Certificate [certpath]
Expand Down
4 changes: 2 additions & 2 deletions test/temporal/test/types.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
[temporal.internal.schedule :as s]
[temporal.internal.child-workflow :as cw])
(:import [java.time Duration Instant]
[io.grpc Grpc InsecureChannelCredentials Metadata]
[io.grpc.netty.shaded.io.grpc.netty GrpcSslContexts]))
[io.temporal.shaded.io.grpc Grpc InsecureChannelCredentials Metadata]
[io.temporal.shaded.io.grpc.netty.shaded.io.grpc.netty GrpcSslContexts]))

(deftest workflow-options
(testing "Verify that our workflow options work"
Expand Down