Skip to content

Commit ba838fe

Browse files
authoredFeb 15, 2023
Don't relocate com.google.gson during shadowing (temporalio#1658)
1 parent d059dd6 commit ba838fe

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed
 

‎temporal-shaded/build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
api(platform("io.micrometer:micrometer-bom:$micrometerVersion"))
1515
api ("com.uber.m3:tally-core:$tallyVersion")
1616
api "org.slf4j:slf4j-api:$slf4jVersion"
17-
api "com.google.code.gson:gson:$gsonVersion"
17+
api "com.google.code.gson:gson:$gsonVersion" //also needed for protobuf
1818
api "io.micrometer:micrometer-core"
1919
api "com.fasterxml.jackson.core:jackson-databind"
2020
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
@@ -65,7 +65,9 @@ shadowJar {
6565
configurations = [project.configurations.shadow]
6666

6767
relocate 'gogoproto', 'io.temporal.shaded.gogoproto' //protobuf
68-
relocate 'com.google', 'io.temporal.shaded.com.google' //protobuf and guava
68+
relocate 'com.google.protobuf', 'io.temporal.shaded.com.google.protobuf'
69+
relocate 'com.google.common', 'io.temporal.shaded.com.google.common' // guava
70+
relocate 'com.google.thirdparty', 'io.temporal.shaded.com.google.thirdparty' // guava
6971
relocate 'io.grpc', 'io.temporal.shaded.io.grpc'
7072

7173
mergeServiceFiles()

0 commit comments

Comments
 (0)
Please sign in to comment.