diff options
| author | Sebastian | 2021-05-01 22:25:55 +0200 |
|---|---|---|
| committer | Sebastian | 2021-05-01 22:25:55 +0200 |
| commit | 788663052e006fd97b8eea68078e75b26817cdad (patch) | |
| tree | db4d84425341463c409d768a834113fe7f28e3c4 | |
| parent | ec3c5ba8473420cfe6a23994bf4868efba891843 (diff) | |
| download | aur-788663052e006fd97b8eea68078e75b26817cdad.tar.gz | |
Fix build with gradle 7
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | fix_gradle_7.patch | 76 |
3 files changed, 87 insertions, 2 deletions
@@ -16,7 +16,9 @@ pkgbase = libsignal-client makedepends = zip makedepends = protobuf source = libsignal-client-java-0.2.3.tar.gz::https://github.com/signalapp/libsignal-client/archive/java-0.2.3.tar.gz + source = fix_gradle_7.patch sha512sums = 8bb650fe1ab20401b69990b92aa0906b3d7d3118f4315821b0b947700ef7179e78f8e2297a5863716ead507b97b27f0ebbf098ff7424143aa6b25a8740bb9ad6 + sha512sums = fdaf7037f0338379701e9669012e4b4e47d17f99a195c70ce057dbdd626c8699abb1c6387fb65d0ab0e32bed5cdceed50db39712f542c150b24606824a3361f5 pkgname = libsignal-client @@ -10,9 +10,12 @@ url="https://github.com/signalapp/${pkgname}" makedepends=('rustup' '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/$_pkgver.tar.gz") +source=("${pkgname}-${_pkgver}.tar.gz::https://github.com/signalapp/${pkgname}/archive/$_pkgver.tar.gz" + "fix_gradle_7.patch" +) -sha512sums=('8bb650fe1ab20401b69990b92aa0906b3d7d3118f4315821b0b947700ef7179e78f8e2297a5863716ead507b97b27f0ebbf098ff7424143aa6b25a8740bb9ad6') +sha512sums=('8bb650fe1ab20401b69990b92aa0906b3d7d3118f4315821b0b947700ef7179e78f8e2297a5863716ead507b97b27f0ebbf098ff7424143aa6b25a8740bb9ad6' + 'fdaf7037f0338379701e9669012e4b4e47d17f99a195c70ce057dbdd626c8699abb1c6387fb65d0ab0e32bed5cdceed50db39712f542c150b24606824a3361f5') prepare() { tar xf "${pkgname}-$_pkgver.tar.gz" @@ -24,6 +27,10 @@ prepare() { # 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 } build() { diff --git a/fix_gradle_7.patch b/fix_gradle_7.patch new file mode 100644 index 000000000000..cf5359e7cbba --- /dev/null +++ b/fix_gradle_7.patch @@ -0,0 +1,76 @@ +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:3.8.2') ++ testImplementation ('junit:junit:3.8.2') + } + + 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' |