From 07b3161b002ec4655a825421f58c6eadfe7424ce Mon Sep 17 00:00:00 2001 From: Felipe Cortez Date: Fri, 10 Oct 2025 19:22:55 -0300 Subject: [PATCH] Use temporal-shaded to avoid protobuf version mismatch Signed-off-by: Felipe Cortez --- project.clj | 3 +-- src/temporal/codec.clj | 2 +- src/temporal/tls.clj | 4 ++-- test/temporal/test/types.clj | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/project.clj b/project.clj index bd0651b..088337c 100644 --- a/project.clj +++ b/project.clj @@ -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"] diff --git a/src/temporal/codec.clj b/src/temporal/codec.clj index fdc6188..b8cc255 100644 --- a/src/temporal/codec.clj +++ b/src/temporal/codec.clj @@ -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 diff --git a/src/temporal/tls.clj b/src/temporal/tls.clj index 4176a35..e92aafd 100644 --- a/src/temporal/tls.clj +++ b/src/temporal/tls.clj @@ -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] diff --git a/test/temporal/test/types.clj b/test/temporal/test/types.clj index 9833119..409c5d2 100644 --- a/test/temporal/test/types.clj +++ b/test/temporal/test/types.clj @@ -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"