Skip to content

Commit bfce5a7

Browse files
TheBlueMattTheBlueMatt
authored
Merge pull request #42 from TheBlueMatt/main
Cut 0.0.100.2 which should be uploadable to Maven Central
2 parents 5a277ea + fbe8e8e commit bfce5a7

File tree

8 files changed

+92
-17
lines changed

8 files changed

+92
-17
lines changed

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,21 @@ jobs:
9696
cp ldk-java-sources.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"
9797
cp ldk-java.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"
9898
cp ldk-java-classes.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"
99+
cp ldk-java-javadoc.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"
99100
cd ldk-java-bins
100101
if ! git diff --exit-code; then
101102
mv "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"* ./
102103
git checkout "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"
103104
apt-get -y install diffoscope
104105
diffoscope ldk-java-sources.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-sources.jar"
106+
diffoscope ldk-java-javadoc.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-javadoc.jar"
105107
diffoscope ldk-java-classes.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-classes.jar"
106108
diffoscope ldk-java.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java.jar"
107109
exit 1
108110
fi
109111
- name: Run Java Tests against built release jar
110112
run: |
111-
mvn install:install-file -Dfile=ldk-java.jar -DgroupId=org.ldk -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar
113+
mvn install:install-file -Dfile=ldk-java.jar -DgroupId=org.lightningdevkit -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar
112114
cd javatester
113115
mvn package
114116
java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar
@@ -309,7 +311,9 @@ jobs:
309311
- name: Run Java Tests against built jar
310312
run: |
311313
mvn -DskipTests=true package
312-
mvn install:install-file -Dfile=target/ldk-java-1.0-SNAPSHOT.jar -DgroupId=org.ldk -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar
314+
export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)"
315+
JAR_VERSION=${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}
316+
mvn install:install-file -Dfile=target/ldk-java-${JAR_VERSION}.jar -DgroupId=org.lightningdevkit -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar
313317
cd javatester
314318
mvn package
315319
java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar
@@ -331,7 +335,8 @@ jobs:
331335
cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_MacOSX-{x86_64,aarch64}.nativelib src/main/resources/
332336
mvn clean
333337
mvn -DskipTests=true package
334-
mvn install:install-file -Dfile=target/ldk-java-1.0-SNAPSHOT.jar -DgroupId=org.ldk -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar
338+
JAR_VERSION=${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}
339+
mvn install:install-file -Dfile=target/ldk-java-${JAR_VERSION}.jar -DgroupId=org.lightningdevkit -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar
335340
cd javatester
336341
mvn package
337342
java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar

‎build-release-jar.sh‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,42 @@ ls src/main/resources/liblightningjni_MacOSX-aarch64.nativelib
1212
export LANG=C
1313

1414
mvn clean
15-
faketime 2021-01-01 mvn -DskipTests=true package
15+
faketime 2021-01-01 mvn -DskipTests=true -Dorg.lightningdevkit.skipdocs=false package
1616

1717
mkdir ziptmp
1818
cd ziptmp
19-
unzip ../target/ldk-java-1.0-SNAPSHOT-sources.jar | grep inflating | awk '{ print $2 }' | sort > ../sources-zip-files.txt
20-
sed -i 's/#Fri Jan 01 00:.* UTC 2021/#Fri Jan 01 00:00:00 UTC 2021/' META-INF/maven/org.ldk/ldk-java/pom.properties
19+
unzip ../target/ldk-java-*-sources.jar | grep inflating | awk '{ print $2 }' | sort > ../sources-zip-files.txt
20+
sed -i 's/#Fri Jan 01 00:.* UTC 2021/#Fri Jan 01 00:00:00 UTC 2021/' META-INF/maven/org.lightningdevkit/ldk-java/pom.properties
2121
touch -d "2021-01-01 00:00 UTC" $(cat ../sources-zip-files.txt)
22-
cat ../sources-zip-files.txt | zip -X@ ../ldk-java-sources.jar
22+
cat ../sources-zip-files.txt | grep -v nativelib | zip -X@ ../ldk-java-sources.jar
23+
rm ../target/ldk-java-*-sources.jar
2324
cd ..
2425
rm -r ziptmp
2526

2627
mkdir ziptmp
2728
cd ziptmp
28-
unzip ../target/ldk-java-1.0-SNAPSHOT.jar | grep inflating | awk '{ print $2 }' | sort > ../classes-zip-files.txt
29-
sed -i 's/#Fri Jan 01 00:.* UTC 2021/#Fri Jan 01 00:00:00 UTC 2021/' META-INF/maven/org.ldk/ldk-java/pom.properties
29+
unzip ../target/ldk-java-*-javadoc.jar | grep inflating | awk '{ print $2 }' | sort > ../javadoc-zip-files.txt
30+
find . | grep '.html$' | xargs -L1 sed -i 's/Generated by javadoc \(.*\) on Fri Jan 01 .* UTC 2021/Generated by javadoc \1 on Fri Jan 01 00:00:00 UTC 2021/g'
31+
for ZIP in *.zip; do
32+
mkdir ziptmptmp
33+
cd ziptmptmp
34+
unzip ../$ZIP | grep inflating | awk '{ print $2 }' | sort > ../../javadoc-zip-zip-files.txt
35+
rm ../$ZIP
36+
touch -d "2021-01-01 00:00 UTC" $(cat ../../javadoc-zip-zip-files.txt)
37+
cat ../../javadoc-zip-zip-files.txt | zip -X@ ../$ZIP
38+
cd ..
39+
rm -r ziptmptmp
40+
done
41+
touch -d "2021-01-01 00:00 UTC" $(cat ../javadoc-zip-files.txt)
42+
cat ../javadoc-zip-files.txt | grep -v nativelib | zip -X@ ../ldk-java-javadoc.jar
43+
rm ../target/ldk-java-*-javadoc.jar
44+
cd ..
45+
rm -r ziptmp
46+
47+
mkdir ziptmp
48+
cd ziptmp
49+
unzip ../target/ldk-java-*.jar | grep inflating | awk '{ print $2 }' | sort > ../classes-zip-files.txt
50+
sed -i 's/#Fri Jan 01 00:.* UTC 2021/#Fri Jan 01 00:00:00 UTC 2021/' META-INF/maven/org.lightningdevkit/ldk-java/pom.properties
3051
sed -i 's/Built-By: .*/Built-By: ldk-deterministic-builds/' META-INF/MANIFEST.MF
3152
touch -d "2021-01-01 00:00 UTC" $(cat ../classes-zip-files.txt)
3253
cat ../classes-zip-files.txt | zip -X@ ../ldk-java.jar

‎genbindings.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,19 @@ set -e
4949
if [ "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" = "" ]; then
5050
export LDK_GARBAGECOLLECTED_GIT_OVERRIDE=$(git describe --tag --dirty)
5151
fi
52+
if [ "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:0:1}" != "v" ]; then
53+
echo "Version tag should start with a v" > /dev/stderr
54+
exit 1
55+
fi
5256

5357
cp "$1/lightning-c-bindings/include/lightning.h" ./
5458
if [ "$(rustc --version --verbose | grep "host:")" = "host: x86_64-apple-darwin" ]; then
5559
# OSX sed is for some reason not compatible with GNU sed
5660
sed -i '' "s/TransactionOutputs/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
61+
sed -i '' "s/^ <version>.*<\/version>/ <version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" pom.xml
5762
else
5863
sed -i "s/TransactionOutputs/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ/g" ./lightning.h
64+
sed -i "s/^ <version>.*<\/version>/ <version>${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}<\/version>/g" pom.xml
5965
fi
6066

6167
echo "Creating Java bindings..."

‎javatester/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<scope>compile</scope>
2828
</dependency>
2929
<dependency>
30-
<groupId>org.ldk</groupId>
30+
<groupId>org.lightningdevkit</groupId>
3131
<artifactId>ldk-java</artifactId>
3232
<version>1.0-SNAPSHOT</version>
3333
<scope>compile</scope>

‎pom.xml‎

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,38 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>org.ldk</groupId>
7+
<groupId>org.lightningdevkit</groupId>
88
<artifactId>ldk-java</artifactId>
9-
<version>1.0-SNAPSHOT</version>
9+
<version>0.0.100.2</version>
10+
11+
<name>LDK Java Bindings and Binaries</name>
12+
<description>LDK Java Bindings and Release Binaries</description>
13+
<url>https://lightningdevkit.org</url>
14+
15+
<licenses>
16+
<license>
17+
<name>MIT License</name>
18+
<url>http://www.opensource.org/licenses/MIT</url>
19+
</license>
20+
<license>
21+
<name>The Apache License, Version 2.0</name>
22+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
23+
</license>
24+
</licenses>
25+
26+
<developers>
27+
<developer>
28+
<name>Lightning Dev Kit Developers</name>
29+
<organization>LDK</organization>
30+
<organizationUrl>https://github.com/lightningdevkit</organizationUrl>
31+
</developer>
32+
</developers>
33+
34+
<scm>
35+
<connection>scm:git:https://github.com/lightningdevkit/ldk-garbagecollected.git</connection>
36+
<url>https://github.com/lightningdevkit/ldk-garbagecollected</url>
37+
</scm>
38+
1039
<dependencies>
1140
<dependency>
1241
<groupId>org.junit.jupiter</groupId>
@@ -36,15 +65,14 @@
3665
<properties>
3766
<maven.compiler.source>1.8</maven.compiler.source>
3867
<maven.compiler.target>1.8</maven.compiler.target>
39-
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
68+
<org.lightningdevkit.skipdocs>true</org.lightningdevkit.skipdocs>
4069
</properties>
4170

4271
<build>
4372
<plugins>
4473
<plugin>
4574
<groupId>org.apache.maven.plugins</groupId>
4675
<artifactId>maven-source-plugin</artifactId>
47-
<version>${maven-source-plugin.version}</version>
4876
<executions>
4977
<execution>
5078
<id>attach-sources</id>
@@ -54,6 +82,21 @@
5482
</execution>
5583
</executions>
5684
</plugin>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-javadoc-plugin</artifactId>
88+
<configuration>
89+
<skip>${org.lightningdevkit.skipdocs}</skip>
90+
</configuration>
91+
<executions>
92+
<execution>
93+
<id>attach-javadocs</id>
94+
<goals>
95+
<goal>jar</goal>
96+
</goals>
97+
</execution>
98+
</executions>
99+
</plugin>
57100
</plugins>
58101
</build>
59102
</project>

‎src/main/java/org/ldk/impl/bindings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public VecOrSliceDef(long dataptr, long datalen, long stride) {
4848
static native String get_lib_version_string();
4949

5050
public static String get_ldk_java_bindings_version() {
51-
return "v0.0.100.1";
51+
return "v0.0.100.2";
5252
}
5353
public static native String get_ldk_c_bindings_version();
5454
public static native String get_ldk_version();

‎src/main/jni/bindings.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static inline LDKStr java_to_owned_str(JNIEnv *env, jstring str) {
133133
}
134134

135135
JNIEXPORT jstring JNICALL Java_org_ldk_impl_bindings_get_1lib_1version_1string(JNIEnv *env, jclass _c) {
136-
return str_ref_to_java(env, "v0.0.100.1", strlen("v0.0.100.1"));
136+
return str_ref_to_java(env, "v0.0.100.2", strlen("v0.0.100.2"));
137137
}
138138
JNIEXPORT jstring JNICALL Java_org_ldk_impl_bindings_get_1ldk_1c_1bindings_1version(JNIEnv *env, jclass _c) {
139139
return str_ref_to_java(env, check_get_ldk_bindings_version(), strlen(check_get_ldk_bindings_version()));

‎src/main/jni/bindings.c.body‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static inline LDKStr java_to_owned_str(JNIEnv *env, jstring str) {
131131
}
132132

133133
JNIEXPORT jstring JNICALL Java_org_ldk_impl_bindings_get_1lib_1version_1string(JNIEnv *env, jclass _c) {
134-
return str_ref_to_java(env, "v0.0.100.1", strlen("v0.0.100.1"));
134+
return str_ref_to_java(env, "v0.0.100.2", strlen("v0.0.100.2"));
135135
}
136136
JNIEXPORT jstring JNICALL Java_org_ldk_impl_bindings_get_1ldk_1c_1bindings_1version(JNIEnv *env, jclass _c) {
137137
return str_ref_to_java(env, check_get_ldk_bindings_version(), strlen(check_get_ldk_bindings_version()));

0 commit comments

Comments
 (0)