Skip to content

Commit d506a8a

Browse files
ben-kaufmanben-kaufman
authored
Merge branch 'main' into fix/peer-address-upsert-main
2 parents 6424efc + 8aa5942 commit d506a8a

15 files changed

Lines changed: 179 additions & 100 deletions

‎.github/workflows/publish-android.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Android Publish
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
inputs:
8+
version:
9+
description: "Version to publish (e.g., v0.1.0)"
10+
required: true
11+
12+
jobs:
13+
publish:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
contents: read
17+
packages: write
18+
19+
steps:
20+
- uses: actions/checkout@v4
21+
- name: Set up JDK 17
22+
uses: actions/setup-java@v4
23+
with:
24+
java-version: '17'
25+
distribution: 'temurin'
26+
server-id: github
27+
settings-path: ${{ github.workspace }}
28+
29+
- name: Setup Gradle
30+
uses: gradle/actions/setup-gradle@v4
31+
32+
- name: Extract version from input or tag
33+
id: version
34+
shell: bash
35+
run: |
36+
VERSION="${{ inputs.version }}"
37+
if [[ -z "$VERSION" ]]; then
38+
VERSION="$GITHUB_REF_NAME"
39+
fi
40+
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
41+
42+
- name: Build with Gradle
43+
working-directory: bindings/kotlin/ldk-node-android
44+
run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}
45+
46+
- name: Publish to GitHub Packages
47+
working-directory: bindings/kotlin/ldk-node-android
48+
env:
49+
GITHUB_ACTOR: ${{ github.actor }}
50+
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
51+
GITHUB_REPO: ${{ github.repository }}
52+
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}

‎.github/workflows/publish-jvm.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: JVM Publish
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
inputs:
8+
version:
9+
description: "Version to publish (e.g., v0.1.0)"
10+
required: true
11+
12+
jobs:
13+
publish:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
contents: read
17+
packages: write
18+
19+
steps:
20+
- uses: actions/checkout@v4
21+
- name: Set up JDK 17
22+
uses: actions/setup-java@v4
23+
with:
24+
java-version: '17'
25+
distribution: 'temurin'
26+
server-id: github
27+
settings-path: ${{ github.workspace }}
28+
29+
- name: Setup Gradle
30+
uses: gradle/actions/setup-gradle@v4
31+
32+
- name: Extract version from input or tag
33+
id: version
34+
shell: bash
35+
run: |
36+
VERSION="${{ inputs.version }}"
37+
if [[ -z "$VERSION" ]]; then
38+
VERSION="$GITHUB_REF_NAME"
39+
fi
40+
echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
41+
42+
- name: Build with Gradle
43+
working-directory: bindings/kotlin/ldk-node-jvm
44+
run: ./gradlew build -x test -Pversion=${{ steps.version.outputs.version }}
45+
46+
- name: Publish to GitHub Packages
47+
working-directory: bindings/kotlin/ldk-node-jvm
48+
env:
49+
GITHUB_ACTOR: ${{ github.actor }}
50+
GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }}
51+
GITHUB_REPO: ${{ github.repository }}
52+
run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }}

‎.gitignore‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@ swift.swiftdoc
2323

2424
# Ignore LDKNodeFFI.xcframework files
2525
/bindings/swift/LDKNodeFFI.xcframework
26-
/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs
27-
/bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.kt
28-
/bindings/kotlin/ldk-node-jvm/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.kt
29-
/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/
30-
31-
# fork
32-
!/bindings/kotlin/ldk-node-android/lib/src/main/jniLibs
33-
!/bindings/kotlin/ldk-node-android/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.kt
34-
!/bindings/kotlin/ldk-node-jvm/lib/src/main/kotlin/org/lightningdevkit/ldknode/ldk_node.kt
35-
!/bindings/kotlin/ldk-node-jvm/lib/src/main/resources/
3626

3727
# IDE and local files
3828
.idea

‎AGENTS.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ RUSTFLAGS="--cfg no_download" cargo build && ./scripts/uniffi_bindgen_generate.s
207207
## Version Bumping Checklist
208208
When bumping the version, ALWAYS update ALL of these files:
209209
1. `Cargo.toml` - main crate version
210-
2. `bindings/kotlin/ldk-node-android/gradle.properties` - Android libraryVersion
211-
3. `bindings/kotlin/ldk-node-jvm/gradle.properties` - JVM libraryVersion
210+
2. `bindings/kotlin/ldk-node-android/gradle.properties` - Android version
211+
3. `bindings/kotlin/ldk-node-jvm/gradle.properties` - JVM version
212212
4. `bindings/python/pyproject.toml` - Python version
213213
5. `Package.swift` - Swift tag (and checksum after building)
214214
6. `CHANGELOG.md` - Add release notes section at top

‎bindings/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUSTFLAGS="--cfg no_download" cargo build && ./scripts/uniffi_bindgen_generate.s
1111
Detailed instructions for publishing a new version of the bindings.
1212

1313
1. Update `Cargo.toml`
14-
2. Update `libraryVersion` in:
14+
2. Update `version` in:
1515
- `bindings/kotlin/ldk-node-android/gradle.properties`
1616
- `bindings/kotlin/ldk-node-jvm/gradle.properties`
1717
3. Run the above command to build all bindings

‎bindings/kotlin/ldk-node-android/README.md‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,32 @@ Publishing new version guide.
44
1. Run in root dir
55
`sh scripts/uniffi_bindgen_generate_kotlin_android.sh`
66

7-
1. Update `libraryVersion` in `bindings/kotlin/ldk-node-android/gradle.properties`.
7+
1. Update `version` in `bindings/kotlin/ldk-node-android/gradle.properties`.
88

99
1. Commit
1010

1111
1. Push new branch (or new tag)
1212

13-
1. Go to [Jitpack repo url](https://jitpack.io/#synonymdev/ldk-node),
14-
choose the build type by tab (ie. releases, branch, etc.), and tap 'Get it'
15-
for the required version.
16-
17-
- If a build already exists, tap the file icon under 'Log' to check the status.
18-
1913
1. In the android project:
2014

21-
- in `settings.gradle.kts` add jitpack repository using `maven("https://jitpack.io")`:
15+
- in `settings.gradle.kts` add GitHub Packages repository:
2216

2317
```kt
2418
dependencyResolutionManagement {
2519
repositories {
2620
google()
2721
mavenCentral()
28-
maven("https://jitpack.io")
22+
maven {
23+
url = uri("https://maven.pkg.github.com/synonymdev/ldk-node")
24+
credentials {
25+
username = providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR")
26+
password = providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN")
27+
}
28+
}
2929
}
3030
```
3131
- add dependency in `libs.versions.toml`:
3232
```toml
33-
# by tag
34-
ldk-node-android = { module = "com.github.synonymdev:ldk-node", version = "v0.6.0-rc.4"
35-
36-
# or by branch
37-
ldk-node-android = { module = "com.github.synonymdev:ldk-node", version = "main-SNAPSHOT"
33+
ldk-node-android = { module = "com.synonym:ldk-node-android", version = "0.7.0-rc.26" }
3834
```
3935
- Run `Sync project with gradle files` action in android studio

‎bindings/kotlin/ldk-node-android/build.gradle.kts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,4 @@ plugins {
1313
kotlin("plugin.serialization") version "2.2.0" apply false
1414
}
1515

16-
// library version is defined in gradle.properties
17-
val libraryVersion: String by project
18-
19-
group = "org.lightningdevkit"
20-
version = libraryVersion
16+
// group and version are defined in gradle.properties

‎bindings/kotlin/ldk-node-android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536m
22
android.useAndroidX=true
33
android.enableJetifier=true
44
kotlin.code.style=official
5-
libraryVersion=0.7.0-rc.27
5+
version=0.7.0-rc.27

‎bindings/kotlin/ldk-node-android/lib/build.gradle.kts‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// library version is defined in gradle.properties
2-
val libraryVersion: String by project
3-
41
plugins {
52
id("com.android.library")
63
kotlin("android")
@@ -21,7 +18,7 @@ android {
2118
compileSdk = 34
2219

2320
defaultConfig {
24-
minSdk = 21
21+
minSdk = 24
2522
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2623
consumerProguardFiles("consumer-rules.pro")
2724
}
@@ -65,39 +62,42 @@ afterEvaluate {
6562
publishing {
6663
publications {
6764
create<MavenPublication>("maven") {
68-
groupId = "org.lightningdevkit"
69-
artifactId = "ldk-node-android"
70-
version = libraryVersion
65+
val mavenArtifactId = "ldk-node-android"
66+
groupId = providers.gradleProperty("group").orNull ?: "com.synonym"
67+
artifactId = mavenArtifactId
68+
version = providers.gradleProperty("version").orNull ?: "0.0.0"
7169

7270
from(components["release"])
7371
pom {
74-
name.set("ldk-node-android")
75-
description.set(
76-
"LDK Node, a ready-to-go Lightning node library built using LDK and BDK."
77-
)
78-
url.set("https://lightningdevkit.org")
72+
name.set(mavenArtifactId)
73+
description.set("LDK Node Android bindings (Synonym fork).")
74+
url.set("https://github.com/synonymdev/ldk-node")
7975
licenses {
80-
license {
81-
name.set("APACHE 2.0")
82-
url.set("https://github.com/lightningdevkit/ldk-node/blob/main/LICENSE-APACHE")
83-
}
8476
license {
8577
name.set("MIT")
86-
url.set("https://github.com/lightningdevkit/ldk-node/blob/main/LICENSE-MIT")
78+
url.set("https://github.com/synonymdev/ldk-node/blob/main/LICENSE-MIT")
8779
}
8880
}
8981
developers {
9082
developer {
91-
id.set("tnull")
92-
name.set("Elias Rohrer")
93-
email.set("dev@tnull.de")
83+
id.set("synonymdev")
84+
name.set("Synonym")
85+
email.set("noreply@synonym.to")
9486
}
9587
}
96-
scm {
97-
connection.set("scm:git:github.com/lightningdevkit/ldk-node.git")
98-
developerConnection.set("scm:git:ssh://github.com/lightningdevkit/ldk-node.git")
99-
url.set("https://github.com/lightningdevkit/ldk-node/tree/main")
100-
}
88+
}
89+
}
90+
}
91+
repositories {
92+
maven {
93+
val repo = System.getenv("GITHUB_REPO")
94+
?: providers.gradleProperty("gpr.repo").orNull
95+
?: "synonymdev/ldk-node"
96+
name = "GitHubPackages"
97+
url = uri("https://maven.pkg.github.com/$repo")
98+
credentials {
99+
username = System.getenv("GITHUB_ACTOR") ?: providers.gradleProperty("gpr.user").orNull
100+
password = System.getenv("GITHUB_TOKEN") ?: providers.gradleProperty("gpr.key").orNull
101101
}
102102
}
103103
}

‎bindings/kotlin/ldk-node-jvm/build.gradle.kts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,4 @@ buildscript {
1010
plugins {
1111
}
1212

13-
// library version is defined in gradle.properties
14-
val libraryVersion: String by project
15-
16-
group = "org.lightningdevkit"
17-
version = libraryVersion
13+
// group and version are defined in gradle.properties

0 commit comments

Comments
 (0)