signald/libsignal-client
1
0
Fork 0
mirror of https://gitlab.com/signald/libraries/libsignal-client.git synced 2024-12-04 19:46:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make a real module

Browse source
This commit is contained in:
finn 2022-03-04 14:16:40 -08:00
parent f420ed5569
commit 6688b0e951
1 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
libsignal.patch
View file

@ -1,13 +1,15 @@
From cd261be821bb7774214c999718f2165f42ccea66 Mon Sep 17 00:00:00 2001
From b4dc1734c72a3695f0ff3fc9ada2a97d4f5550cb Mon Sep 17 00:00:00 2001
From: signald <nobody@signald.org>
Date: Thu, 18 Nov 2021 17:54:25 -0800
Subject: [PATCH] update gradle files
---
java/build.gradle | 8 +---
java/java/build.gradle | 98 +++++++-----------------------------------
java/settings.gradle | 2 +-
3 files changed, 17 insertions(+), 91 deletions(-)
java/build.gradle | 8 +-
java/java/build.gradle | 100 ++++-------------------
java/java/src/main/java/module-info.java | 30 +++++++
java/settings.gradle | 2 +-
4 files changed, 48 insertions(+), 92 deletions(-)
create mode 100644 java/java/src/main/java/module-info.java
diff --git a/java/build.gradle b/java/build.gradle
index 8a64a47..79d80b5 100644
@ -32,10 +34,10 @@ index 8a64a47..79d80b5 100644
- dependsOn 'makeJniLibrariesDesktop', 'makeJniLibrariesAndroid'
-}
diff --git a/java/java/build.gradle b/java/java/build.gradle
index 55b1ee2..c964251 100644
index 55b1ee2..7f23eed 100644
--- a/java/java/build.gradle
+++ b/java/java/build.gradle
@@ -7,11 +7,10 @@ buildscript {
@@ -7,13 +7,12 @@ buildscript {
plugins {
id "de.undercouch.download" version "4.1.1"
@ -46,8 +48,11 @@ index 55b1ee2..c964251 100644
-apply plugin: 'maven'
-apply plugin: 'signing'
sourceCompatibility = 1.7
-sourceCompatibility = 1.7
+sourceCompatibility = 1.9
archivesBaseName = "signal-client-java"
version = version_number
group = group_info
@@ -24,18 +23,9 @@ repositories {
}
@ -174,6 +179,43 @@ index 55b1ee2..c964251 100644
-tasks.withType(JavaCompile) {
- compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
}
diff --git a/java/java/src/main/java/module-info.java b/java/java/src/main/java/module-info.java
new file mode 100644
index 0000000..55220b9
--- /dev/null
+++ b/java/java/src/main/java/module-info.java
@@ -0,0 +1,30 @@
+module org.signald.libsignal.client {
+ requires java.base;
+
+ exports org.signal.client.internal;
+ exports org.signal.libsignal.crypto;
+ exports org.signal.libsignal.crypto.jce;
+ exports org.signal.libsignal.devicetransfer;
+ exports org.signal.libsignal.hsmenclave;
+ exports org.signal.libsignal.metadata;
+ exports org.signal.libsignal.metadata.certificate;
+ exports org.signal.libsignal.metadata.protocol;
+ exports org.signal.zkgroup;
+ exports org.signal.zkgroup.auth;
+ exports org.signal.zkgroup.groups;
+ exports org.signal.zkgroup.internal;
+ exports org.signal.zkgroup.profiles;
+ exports org.signal.zkgroup.receipts;
+ exports org.whispersystems.libsignal;
+ exports org.whispersystems.libsignal.ecc;
+ exports org.whispersystems.libsignal.fingerprint;
+ exports org.whispersystems.libsignal.groups;
+ exports org.whispersystems.libsignal.groups.state;
+ exports org.whispersystems.libsignal.kdf;
+ exports org.whispersystems.libsignal.logging;
+ exports org.whispersystems.libsignal.protocol;
+ exports org.whispersystems.libsignal.state;
+ exports org.whispersystems.libsignal.state.impl;
+ exports org.whispersystems.libsignal.util;
+ exports org.whispersystems.libsignal.util.guava;
+}
\ No newline at end of file
diff --git a/java/settings.gradle b/java/settings.gradle
index 7412250..4c0f3cd 100644
--- a/java/settings.gradle