Merge pull request #448 from stellar/shade-kotlin-deps

Shade kotlin dependencies
lightsail-network · Jul 25, 2022 · 7ad758b · 7ad758b
2 parents 9c778c8 + 9e9ebdb
commit 7ad758b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ As this project is pre 1.0, breaking changes may happen for minor version bumps.
 
 ## Pending
 
+## 0.36.0
+
+* Fix bug in `KeyPair.fromSecretSeed(char[] seed)`. ([#447](https://github.com/stellar/java-stellar-sdk/pull/447))
+* Shade kotlin dependencies to prevent 'Duplicate class' errors. ([#448](https://github.com/stellar/java-stellar-sdk/pull/448))
+
 ## 0.35.0
 
 * Update JDK compatibility version from Java 1.6 to Java 1.8 and bump the version of few libraries ([#444](https://github.com/stellar/java-stellar-sdk/pull/444)):

diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-version = '0.35.0'
+version = '0.36.0'
 group = 'stellar'
 jar.enabled = false
 
@@ -49,6 +49,9 @@ shadowJar {
     relocate 'org.checkerframework','shadow.org.checkerframework'
     relocate 'okhttp3','shadow.okhttp3'
     relocate 'okio','shadow.okio'
+    relocate 'kotlin','shadow.kotlin'
+    relocate 'org.intellij','shadow.org.intellij'
+    relocate 'org.jetbrains','shadow.org.jetbrains'
 }
 
 repositories {