Version 0.15.0

3 files changed, 10 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0e9da9b1c34..4c342333f5f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libsignal-client
 	pkgdesc = Library for the Signal Protocol.
-	pkgver = 0.12.3
+	pkgver = 0.15.0
 	pkgrel = 1
 	url = https://github.com/signalapp/libsignal
 	arch = i686
@@ -14,9 +14,7 @@ pkgbase = libsignal-client
 	makedepends = git
 	makedepends = zip
 	makedepends = protobuf
-	source = libsignal-0.12.3.tar.gz::https://github.com/signalapp/libsignal/archive/refs/tags/v0.12.3.tar.gz
-	source = fix_gradle_7.patch
-	sha512sums = e30ea4122f785c7c017375921fe952e5afdeec751a18da8653d775b2b060670b477acc79c4f3fc1edd4598ab1a91de5f0433894f717fb20cde1a65efc3ec951b
-	sha512sums = 888960120041304ba01eb1cd9b600062e5b23276784a5e174433f76bc667c3ca43ae844c355721e14b7a93e0ecc39053f108c803acef79f105e715609365b802
+	source = libsignal-0.15.0.tar.gz::https://github.com/signalapp/libsignal/archive/refs/tags/v0.15.0.tar.gz
+	sha512sums = eb02b7db9ecc3d537953108431add89bfc5e7377c182c0246f1dff6655c092b861dce78f744ebb14bc6aa3972b3945d8b741273c98dabd5436d50f70d5b228c5
 
 pkgname = libsignal-client
diff --git a/PKGBUILD b/PKGBUILD
index 48fd20860ad7..6bcf8e40a5a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,18 @@
 pkgname=libsignal-client
 _pkgname=libsignal
 _libname=libsignal_jni
-pkgver=0.12.3
+pkgver=0.15.0
 pkgrel=1
 pkgdesc='Library for the Signal Protocol.'
 url="https://github.com/signalapp/${_pkgname}"
 makedepends=('cargo' 'gradle' 'git' 'zip' 'protobuf')
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 license=('GPL3')
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/signalapp/${_pkgname}/archive/refs/tags/v$pkgver.tar.gz"
-        "fix_gradle_7.patch"
+source=(
+    "${_pkgname}-${pkgver}.tar.gz::https://github.com/signalapp/${_pkgname}/archive/refs/tags/v$pkgver.tar.gz"
 )
 
-sha512sums=('e30ea4122f785c7c017375921fe952e5afdeec751a18da8653d775b2b060670b477acc79c4f3fc1edd4598ab1a91de5f0433894f717fb20cde1a65efc3ec951b'
-            '888960120041304ba01eb1cd9b600062e5b23276784a5e174433f76bc667c3ca43ae844c355721e14b7a93e0ecc39053f108c803acef79f105e715609365b802')
+sha512sums=('eb02b7db9ecc3d537953108431add89bfc5e7377c182c0246f1dff6655c092b861dce78f744ebb14bc6aa3972b3945d8b741273c98dabd5436d50f70d5b228c5')
 
 prepare() {
   tar xf "${_pkgname}-$pkgver.tar.gz"
@@ -25,11 +24,7 @@ prepare() {
   # rm -f rust-toolchain
 
   # Do not build the android library
-  sed -i "s/, ':android'//" java/settings.gradle
-  # Fix build with gradle 7
-  sed -i "s/compile/implementation/" java/tests/build.gradle
-  sed -i "s/Compile/Implementation/" java/tests/build.gradle
-  patch -p1 < ../fix_gradle_7.patch
+  sed -i "s/include ':android'//" java/settings.gradle
 }
 
 build() {
@@ -38,7 +33,7 @@ build() {
   ./build_jni.sh desktop
   gradle --no-daemon assemble
 
-  zip -d "java/build/libs/signal-client-java-${pkgver}.jar" "${_libname}.so"
+  zip -d "client/build/libs/libsignal-client-${pkgver}.jar" "${_libname}.so"
 }
 
 package() {
@@ -46,6 +41,6 @@ package() {
 
   install -m755 -d "${pkgdir}/usr/share/java/${pkgname}" "${pkgdir}/usr/lib"
 
-  install -Dm644 "java/java/build/libs/signal-client-java-${pkgver}.jar" "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+  install -Dm644 "java/client/build/libs/libsignal-client-${pkgver}.jar" "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
   install -Dm644 "target/release/${_libname}.so" "$pkgdir/usr/lib/"
 }
diff --git a/fix_gradle_7.patch b/fix_gradle_7.patch
deleted file mode 100644
index 8aeb3e00035b..000000000000
--- a/fix_gradle_7.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/java/java/build.gradle b/java/java/build.gradle
-index 2f31542..bd52473 100644
---- a/java/java/build.gradle
-+++ b/java/java/build.gradle
-@@ -6,7 +6,6 @@ buildscript {
- }
- 
- apply plugin: 'java'
--apply plugin: 'maven'
- apply plugin: 'signing'
- 
- sourceCompatibility = 1.7
-@@ -28,7 +27,7 @@ sourceSets {
- }
- 
- dependencies {
--    testCompile ('junit:junit:4.12')
-+    testImplementation ('junit:junit:4.12')
- }
- 
- test {
-@@ -67,54 +66,6 @@ signing {
-     sign configurations.archives
- }
- 
--uploadArchives {
--    configuration = configurations.archives
--    repositories.mavenDeployer {
--        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
--
--        repository(url: getReleaseRepositoryUrl()) {
--            authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
--        }
--
--        pom.project {
--            name 'signal-client-java'
--            packaging 'jar'
--            description 'Signal Protocol cryptography library for Java'
--            url 'https://github.com/signalapp/libsignal-client'
--
--            scm {
--                url 'scm:git@github.com:signalapp/libsignal-client.git'
--                connection 'scm:git@github.com:signalapp/libsignal-client.git'
--                developerConnection 'scm:git@github.com:signalapp/libsignal-client.git'
--            }
--
--            licenses {
--                license {
--                    name 'AGPLv3'
--                    url 'https://www.gnu.org/licenses/agpl-3.0.txt'
--                    distribution 'repo'
--                }
--            }
--
--            developers {
--                developer {
--                    name 'Signal Messenger LLC'
--                }
--            }
--        }
--    }
--}
--
--task installArchives(type: Upload) {
--    description "Installs the artifacts to the local Maven repository."
--    configuration = configurations['archives']
--    repositories {
--        mavenDeployer {
--            repository url: "file://${System.properties['user.home']}/.m2/repository"
--        }
--    }
--}
--
- task packageJavadoc(type: Jar, dependsOn: 'javadoc') {
-     from javadoc.destinationDir
-     classifier = 'javadoc'