Rename workspace members (subfolders) (#149)

* Rename ls-sdk-bindings workspace member

* Rename ls-sdk-core workspace member

* Rename ls-sdk-react-native

.github/workflows/main.yml

@@ -41,26 +41,26 @@ jobs:
           cargo clippy -- -D warnings
 
   build-bindings:
-    name: Test ls-sdk-bindings
+    name: Test bindings
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Build ls-sdk-bindings
-        working-directory: lib/ls-sdk-bindings
+      - name: Build bindings
+        working-directory: lib/bindings
         run: cargo build
 
       - name: Setup python
         uses: actions/setup-python@v4
         with:
           python-version: '3.11'
 
-      - name: Run ls-sdk-bindings tests
+      - name: Run bindings tests
         run: |
           curl -o jna-5.12.1.jar https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
           export CLASSPATH=$(pwd)/jna-5.12.1.jar;
-          cd lib/ls-sdk-bindings
+          cd lib/bindings
           cargo test
 
   react-native:
@@ -71,7 +71,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: React native codegen
-        working-directory: lib/ls-sdk-react-native
+        working-directory: packages/react-native
         run: |
           yarn global add tslint typescript
           brew update

README.md

@@ -1,9 +1,9 @@
 # Breez Liquid SDK
 
-- `lib`: [lib/README.md](lib/ls-sdk-core/README.md)
+- `lib`: [lib/README.md](lib/core/README.md)
 - `cli`: [cli/README.md](cli/README.md)
 - Bindings
-  - `python`: [lib/bindings-python/README.md]()
+  - `python`: [lib/bindings/bindings-python/README.md]()
 
 ## Roadmap
 - [x] Send/Recieve Lightning payments

cli/Cargo.toml

@@ -8,7 +8,7 @@ version = "0.0.1"
 [dependencies]
 anyhow = "1.0.80"
 bip39 = "2.0.0"
-breez-liquid-sdk = { path = "../lib/ls-sdk-core" }
+breez-liquid-sdk = { path = "../lib/core" }
 clap = { version = "4.5.1", features = ["derive"] }
 env_logger = "0.11"
 log = "0.4.20"

lib/.gitignore

@@ -1,4 +1,4 @@
 target
 *.so
 *.a
-ls-sdk-bindings/ffi
+bindings/ffi

lib/Cargo.toml

@@ -7,9 +7,9 @@ rpath = true
 
 [workspace]
 members = [
-    "ls-sdk-bindings",
-    "ls-sdk-bindings/bindings-react-native",
-    "ls-sdk-core",
+    "bindings",
+    "bindings/bindings-react-native",
+    "core",
 ]
 resolver = "2"
 

lib/ls-sdk-bindings/Cargo.toml → lib/bindings/Cargo.toml

@@ -14,7 +14,7 @@ crate-type = ["staticlib", "cdylib", "lib"]
 
 [dependencies]
 anyhow = { workspace = true }
-breez-liquid-sdk = { path = "../ls-sdk-core" }
+breez-liquid-sdk = { path = "../core" }
 uniffi = { workspace = true, features = [ "bindgen-tests", "cli" ] }
 thiserror = { workspace = true }
 

lib/ls-sdk-bindings/bindings-android/gradlew.bat → lib/bindings/bindings-android/gradlew.bat

@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

lib/ls-sdk-react-native/DEVELOPING.md → packages/react-native/DEVELOPING.md

@@ -8,7 +8,7 @@ The Breez Liquid SDK React Native plugin consumes the underlying Breez Liquid SD
 When developing, it can be useful to work with a locally built version of the Breez Liquid SDK instead of relying on what is published already on CocoaPods / Jitpack.
 To do this, you first need to build the Breez Liquid SDK bindings locally and then point the plugin to make use of the locally built Breez Liquid SDK bindings.
 
-All the following commands can be run in the `lib/ls-sdk-react-native` directory.
+All the following commands can be run in the `packages/react-native` directory.
 
 ## Prerequisites
 
@@ -70,11 +70,11 @@ make ios react-native
 To use the locally built bindings instead of integrating them remotely, make the following changes:
 
 - For iOS:
-	- Rename the podspec files in `lib/ls-sdk-react-native/`:
+	- Rename the podspec files in `packages/react-native/`:
 		- Rename `breez_liquid_sdk.podspec` to `breez_liquid_sdk.podspec.prod`
 		- Rename `BreezLiquidSDK.podspec.dev` to `BreezLiquidSDK.podspec`
 - For Android:
-	- Comment out the following line from the dependencies section in `lib/ls-sdk-react-native/android/build.gradle`:
+	- Comment out the following line from the dependencies section in `packages/react-native/android/build.gradle`:
 		- `implementation("com.github.breez:breez-liquid-sdk:${getVersionFromNpmPackage()}") { exclude group:"net.java.dev.jna" }`
 
 Reinstall the dependencies in the example project and run it.
@@ -83,7 +83,7 @@ It will now use the locally built bindings.
 ## Testing with the example app
 
 To test locally built bindings in the example app, the npm dependencies need to be updated to use the local package.
-In `lib/ls-sdk-react-native/example/package.json` replace the current version with `file:../`:
+In `packages/react-native/example/package.json` replace the current version with `file:../`:
 ```json
     "@breeztech/react-native-breez-liquid-sdk": "file:../",
 ```
@@ -93,7 +93,7 @@ Run the npm/yarn install to download dependences for both the react-native-breez
 yarn bootstrap
 ```
 
-Finally in the `lib/ls-sdk-react-native/example/` directory start either the iOS or Android app:
+Finally in the `packages/react-native/example/` directory start either the iOS or Android app:
 ```bash
 yarn android
 ```