Update build scripts to use new framework name.

Author: arik-so

.github/actions/archive-framework/action.yml

@@ -17,8 +17,8 @@ runs:
 
                 LDK_C_BINDINGS_BINARY_DIRECTORY="" \
                 xcodebuild archive \
-                  -project 'LDKFramework/LDKFramework.xcodeproj' \
-                  -scheme 'LDKFramework' \
+                  -project 'LDKFramework/LDK.xcodeproj' \
+                  -scheme 'LightningDevKit' \
                   -destination 'generic/platform=${{ inputs.destination }}' \
                   -archivePath "/Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/${{ inputs.human_readable_platform }}/${{ inputs.human_readable_platform }}" \
                   ENABLE_BITCODE=NO \

.github/actions/install-dependencies/action.yml

@@ -12,8 +12,8 @@ runs:
             run: |
                 echo `pwd`
                 mkdir -p ./bindings/artifacts/bin
-                git clone --branch 2022-06-108-java-bindings https://github.com/TheBlueMatt/rust-lightning ./bindings/artifacts/rust-lightning
-                git clone --branch v0.0.108.2 https://github.com/lightningdevkit/ldk-c-bindings ./bindings/artifacts/ldk-c-bindings
+                git clone --branch 2022-07-109-java-bindings https://github.com/TheBlueMatt/rust-lightning ./bindings/artifacts/rust-lightning
+                git clone --branch v0.0.109.0 https://github.com/lightningdevkit/ldk-c-bindings ./bindings/artifacts/ldk-c-bindings
         -   name: Install Rust, required targets
             shell: bash
             run: |

.github/actions/upload-xcframework-artifact/action.yml

@@ -0,0 +1,14 @@
+name: Upload XCFramework
+description: Create artifact containing a zipped xcframework.
+runs:
+    using: composite
+    steps:
+        -   name: Zip Xcframework
+            shell: bash
+            run: |
+                ditto -c -k --sequesterRsrc /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit.xcframework LightningDevKit.xcframework.zip
+        -   name: Upload Framework Artifact
+            uses: actions/upload-artifact@v3
+            with:
+                name: LightningDevKit
+                path: LightningDevKit.xcframework.zip

.github/workflows/build-xcframework-parallel-archives.yml

@@ -78,11 +78,5 @@ jobs:
                     python3 ./src/scripts/generate_xcframework.py
                 env:
                     PRESERVE_XCARCHIVES: true
-            -   name: Zip Xcframework
-                run: |
-                    ditto -c -k --sequesterRsrc /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LDKFramework.xcframework LDKFramework.xcframework.zip
-            -   name: Upload Framework Artifact
-                uses: actions/upload-artifact@v3
-                with:
-                    name: LDKFramework
-                    path: LDKFramework.xcframework.zip
+            -   name: Create XCFramework artifact
+                uses: ./.github/actions/upload-xcframework-artifact

.github/workflows/build-xcframework-parallel-libldk.yml

@@ -92,11 +92,5 @@ jobs:
                 shell: bash
                 run:
                     python3 ./src/scripts/generate_xcframework.py
-            -   name: Zip Xcframework
-                run: |
-                    ditto -c -k --sequesterRsrc /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LDKFramework.xcframework LDKFramework.xcframework.zip
-            -   name: Upload Framework Artifact
-                uses: actions/upload-artifact@v3
-                with:
-                    name: LDKFramework
-                    path: LDKFramework.xcframework.zip
+            -   name: Create XCFramework artifact
+                uses: ./.github/actions/upload-xcframework-artifact

.github/workflows/build-xcframework-sequential.yml

@@ -31,11 +31,5 @@ jobs:
                 uses: ./.github/actions/install-dependencies
             -   name: Generate XCFramework
                 uses: ./.github/actions/generate-xcframework
-            -   name: Zip Xcframework
-                run: |
-                    ditto -c -k --sequesterRsrc /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LDKFramework.xcframework LDKFramework.xcframework.zip
-            -   name: Upload Framework Artifact
-                uses: actions/upload-artifact@v3
-                with:
-                    name: LDKFramework
-                    path: LDKFramework.xcframework.zip
+            -   name: Create XCFramework artifact
+                uses: ./.github/actions/upload-xcframework-artifact

.github/workflows/release-framework.yml

@@ -34,14 +34,8 @@ jobs:
                 uses: ./.github/actions/install-dependencies
             -   name: Generate XCFramework
                 uses: ./.github/actions/generate-xcframework
-            -   name: Zip Xcframework
-                run: |
-                    ditto -c -k --sequesterRsrc /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LDKFramework.xcframework LDKFramework.xcframework.zip
-            -   name: Upload Framework Artifact
-                uses: actions/upload-artifact@v3
-                with:
-                    name: LDKFramework.xcframework.zip
-                    path: LDKFramework.xcframework.zip
+            -   name: Create XCFramework artifact
+                uses: ./.github/actions/upload-xcframework-artifact
     release:
         name: Publish Release
         runs-on: ubuntu-latest
@@ -50,8 +44,8 @@ jobs:
             -   name: Download Framework Artifact
                 uses: actions/download-artifact@v3
                 with:
-                    name: LDKFramework.xcframework.zip
+                    name: LightningDevKit
             -   name: Create Release
                 uses: softprops/action-gh-release@v1
                 with:
-                    files: LDKFramework.xcframework.zip
+                    files: LightningDevKit.xcframework.zip

.github/workflows/swift.yml

@@ -23,12 +23,12 @@ jobs:
                     # Note this is a different endpoint, as we need one non-upstream commit!
                     # git clone https://git.bitcoin.ninja/rust-lightning
                     # git clone https://github.com/TheBlueMatt/rust-lightning
-                    git clone --branch 2022-06-108-java-bindings https://github.com/TheBlueMatt/rust-lightning
+                    git clone --branch 2022-07-109-java-bindings https://github.com/TheBlueMatt/rust-lightning
                     cd rust-lightning
                     echo "rust-lightning commit hash:"
                     git rev-parse HEAD
                     cd ..
-                    git clone --branch v0.0.108.2 https://github.com/lightningdevkit/ldk-c-bindings
+                    git clone --branch v0.0.109.0 https://github.com/lightningdevkit/ldk-c-bindings
                     # git clone https://github.com/TheBlueMatt/ldk-c-bindings
                     cd ldk-c-bindings
                     echo "ldk-c-bindings commit hash:"

src/scripts/generate_xcframework.py

@@ -22,13 +22,13 @@ def parse_config() -> ScriptConfig:
 def run(config: ScriptConfig):
 	build_products_directory = os.path.realpath(os.path.join(os.path.dirname(__file__), '../../bindings/bin'))
 	xcode_project_path = os.path.realpath(
-		os.path.join(os.path.dirname(__file__), '../../xcode/LDKFramework/LDKFramework.xcodeproj')
+		os.path.join(os.path.dirname(__file__), '../../xcode/LDKFramework/LDK.xcodeproj')
 	)
 	framework_input_flags: [str] = []
 	xcframework_output_path = os.path.join(
 		build_products_directory,
 		config.RUST_CONFIGURATION,
-		'LDKFramework.xcframework'
+		'LightningDevKit.xcframework'
 	)
 
 	child_environment = dict(os.environ)
@@ -60,7 +60,7 @@ def run(config: ScriptConfig):
 		# XCFRAMEWORK_INPUT_FLAGS="${XCFRAMEWORK_INPUT_FLAGS}-framework ${CURRENT_ARCHIVE_PATH}.xcarchive/Products/Library/Frameworks/LDKFramework.framework "
 		framework_input_flags += [
 			'-framework',
-			f'{xcarchive_output_path}.xcarchive/Products/Library/Frameworks/LDKFramework.framework'
+			f'{xcarchive_output_path}.xcarchive/Products/Library/Frameworks/LightningDevKit.framework'
 		]
 
 		if config.PRESERVE_XCARCHIVES:
@@ -81,7 +81,7 @@ def run(config: ScriptConfig):
 				'archive',
 				'-verbose',
 				'-project', xcode_project_path,
-				'-scheme', 'LDKFramework',
+				'-scheme', 'LightningDevKit',
 				'-destination', f'generic/platform={current_destination}',
 				'-derivedDataPath', derived_data_directory,
 				'-archivePath', xcarchive_output_path,

src/scripts/script_config.py

@@ -50,7 +50,8 @@ def parse(cls, allow_ldk_argument=True, parse_configuration=False, parse_lipo_ou
 
 		if not ldk_directory_string:
 			# if xcarchives are preserved, we don't need an LDK_C_BINDINGS_BASE
-			print('Missing LDK C-bindings base directory. Either call the value or set the environment variable.', file=sys.stderr)
+			print('Missing LDK C-bindings base directory. Either run command with the value or set the environment variable.', file=sys.stderr)
+			print(f'Example usage: \npython3 {sys.argv[0]} /path/to/ldk-c-bindings')
 			if not should_preserve_xcarchives:
 				sys.exit(1)
 			else: