From bfa7c24f8351e3aa2870bd2ecd5121e66ddc72a2 Mon Sep 17 00:00:00 2001
From: Ross Savage <551697+dangeross@users.noreply.github.com>
Date: Wed, 18 Sep 2024 13:19:50 +0200
Subject: [PATCH] Fix the namespace conflict (#490)

---
 lib/bindings/langs/android/lib/proguard-rules.pro             | 4 ++--
 lib/bindings/langs/android/lib/src/main/AndroidManifest.xml   | 2 +-
 .../breez-sdk-liquid-kmp/build.gradle.kts                     | 4 ++--
 .../breez-sdk-liquid-kmp/consumer-rules.pro                   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/bindings/langs/android/lib/proguard-rules.pro b/lib/bindings/langs/android/lib/proguard-rules.pro
index 3f0e734..82f6c02 100644
--- a/lib/bindings/langs/android/lib/proguard-rules.pro
+++ b/lib/bindings/langs/android/lib/proguard-rules.pro
@@ -23,10 +23,10 @@
 # for JNA
 -dontwarn java.awt.*
 -keep class com.sun.jna.** { *; }
--keep class technology.breez.* { *; }
+-keep class technology.breez.liquid.* { *; }
 -keep class breez_sdk_liquid.** { *; }
 -keep class breez_sdk_liquid_notification.** { *; }
--keepclassmembers class * extends technology.breez.* { public *; }
+-keepclassmembers class * extends technology.breez.liquid.* { public *; }
 -keepclassmembers class * extends breez_sdk_liquid.** { public *; }
 -keepclassmembers class * extends breez_sdk_liquid_notification.** { public *; }
 -keepclassmembers class * extends com.sun.jna.** { public *; }
diff --git a/lib/bindings/langs/android/lib/src/main/AndroidManifest.xml b/lib/bindings/langs/android/lib/src/main/AndroidManifest.xml
index dd3239a..5090dda 100644
--- a/lib/bindings/langs/android/lib/src/main/AndroidManifest.xml
+++ b/lib/bindings/langs/android/lib/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="technology.breez">
+  package="technology.breez.liquid">
 
   <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/build.gradle.kts b/lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/build.gradle.kts
index aafa285..82e5d3b 100644
--- a/lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/build.gradle.kts
+++ b/lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/build.gradle.kts
@@ -79,7 +79,7 @@ kotlin {
 }
 
 android {
-    namespace = "technology.breez"
+    namespace = "technology.breez.liquid"
     compileSdk = 33
 
     defaultConfig {
@@ -95,7 +95,7 @@ android {
 
 val libraryVersion: String by project
 
-group = "technology.breez"
+group = "technology.breez.liquid"
 version = libraryVersion
 
 publishing {
diff --git a/lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/consumer-rules.pro b/lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/consumer-rules.pro
index de70ba4..1dd6065 100644
--- a/lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/consumer-rules.pro
+++ b/lib/bindings/langs/kotlin-multiplatform/breez-sdk-liquid-kmp/consumer-rules.pro
@@ -24,7 +24,7 @@
 -dontwarn java.awt.*
 -keep class com.sun.jna.* { *; }
 -keepclassmembers class * extends com.sun.jna.* { public *; }
--keep class technology.breez.* { *; }
+-keep class technology.breez.liquid.* { *; }
 -keep class breez_sdk_liquid.** { *; }
--keepclassmembers class * extends technology.breez.* { public *; }
+-keepclassmembers class * extends technology.breez.liquid.* { public *; }
 -keepclassmembers class * extends breez_sdk_liquid.** { public *; }
\ No newline at end of file