update to v0.17.0

This commit is contained in:
finn 2022-06-16 12:49:12 -07:00
parent ce61210b39
commit 46e568ac2a
2 changed files with 17 additions and 18 deletions

View file

@ -3,7 +3,7 @@ stages:
- bindings
variables:
libsignal_version: "v0.15.0"
libsignal_version: "v0.17.0"
GRADLE_OPTS: -Dorg.gradle.daemon=false
.multitarget:

View file

@ -1,19 +1,19 @@
From fe061a45bd30cfd242c89cd7f6f39769cd2f34d4 Mon Sep 17 00:00:00 2001
From 89b9e3fd15bbb5241e3327446a2c63de7afddf32 Mon Sep 17 00:00:00 2001
From: signald <nobody@signald.org>
Date: Wed, 6 Apr 2022 11:22:32 -0700
Subject: [PATCH] update gradle files
Date: Thu, 16 Jun 2022 12:48:11 -0700
Subject: [PATCH] update build files
---
java/build.gradle | 9 +--------
java/client/build.gradle | 32 +++++++++-----------------------
java/client/build.gradle | 30 ++++++++++--------------------
java/settings.gradle | 11 +----------
3 files changed, 11 insertions(+), 41 deletions(-)
3 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/java/build.gradle b/java/build.gradle
index 0b62e4ac..1d67021c 100644
index 1f6dba0a..75f5ee09 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -6,7 +6,7 @@ def version_number = "0.15.0"
@@ -6,7 +6,7 @@ def version_number = "0.17.0"
subprojects {
ext.version_number = version_number
@ -37,7 +37,7 @@ index 0b62e4ac..1d67021c 100644
group 'Rust'
commandLine 'cargo', 'clean'
diff --git a/java/client/build.gradle b/java/client/build.gradle
index 7ee6b154..5dfdea74 100644
index 7ee6b154..3b3d5fdf 100644
--- a/java/client/build.gradle
+++ b/java/client/build.gradle
@@ -1,7 +1,6 @@
@ -48,7 +48,7 @@ index 7ee6b154..5dfdea74 100644
}
sourceCompatibility = 1.8
@@ -46,23 +45,12 @@ java {
@@ -46,23 +45,14 @@ java {
withJavadocJar()
}
@ -62,7 +62,8 @@ index 7ee6b154..5dfdea74 100644
- }
- }
-}
-
+
// MARK: Publishing
publishing {
@ -73,7 +74,7 @@ index 7ee6b154..5dfdea74 100644
from components.java
pom {
@@ -93,16 +81,14 @@ publishing {
@@ -93,16 +83,16 @@ publishing {
}
repositories {
maven {
@ -91,16 +92,15 @@ index 7ee6b154..5dfdea74 100644
}
}
}
-}
-
}
-signing {
- required { isReleaseBuild() && gradle.taskGraph.hasTask(":client:publish") }
- sign publishing.publications.mavenJava
-}
+}
\ No newline at end of file
+
diff --git a/java/settings.gradle b/java/settings.gradle
index f6414646..13575990 100644
index f6414646..34cf9276 100644
--- a/java/settings.gradle
+++ b/java/settings.gradle
@@ -6,13 +6,4 @@ pluginManagement {
@ -118,7 +118,6 @@ index f6414646..13575990 100644
- throw new GradleException("building for Android requires JDK 11 or newer; use 'client:' or 'server:' to only build certain products")
-}
+include ':client'
\ No newline at end of file
--
2.30.2