java module maybe
This commit is contained in:
parent
774434e2e1
commit
1fe5a90467
2 changed files with 10 additions and 6 deletions
6
build.sh
6
build.sh
|
@ -7,4 +7,8 @@ git config user.name signald
|
|||
git am ../libsignal-service-java.patch
|
||||
python3 ../update-verification-metadata.py
|
||||
git diff --color=always
|
||||
gradle assemble publish || (gradle --write-verification-metadata sha256 && git diff --color=always && exit 1)
|
||||
gradle assemble || (gradle --write-verification-metadata sha256 && git diff --color=always && exit 1)
|
||||
|
||||
if [ "$CI_COMMIT_REF_PROTECTED" == "true" ]; then
|
||||
gradle publish
|
||||
fi
|
|
@ -1,4 +1,4 @@
|
|||
From 20ce40c4c4a960720ad7ebbe758500ed2c78b475 Mon Sep 17 00:00:00 2001
|
||||
From adbb5ae73f1fd61a17120b0f9cb44d7f6a063acd Mon Sep 17 00:00:00 2001
|
||||
From: signald <nobody@signald.org>
|
||||
Date: Fri, 11 Feb 2022 23:16:57 -0800
|
||||
Subject: [PATCH] update gradle files
|
||||
|
@ -56,7 +56,7 @@ index 41c2533..f486ea8 100644
|
|||
if (JavaVersion.current().isJava8Compatible()) {
|
||||
allprojects {
|
||||
diff --git a/dependencies.gradle b/dependencies.gradle
|
||||
index b9e6765..85a91ba 100644
|
||||
index b9e6765..d57dea2 100644
|
||||
--- a/dependencies.gradle
|
||||
+++ b/dependencies.gradle
|
||||
@@ -8,8 +8,7 @@ dependencyResolutionManagement {
|
||||
|
@ -65,7 +65,7 @@ index b9e6765..85a91ba 100644
|
|||
// 1st Party
|
||||
- alias('signal-client-java').to('org.whispersystems', 'signal-client-java').versionRef('signal-client')
|
||||
- alias('signal-client-android').to('org.whispersystems', 'signal-client-android').versionRef('signal-client')
|
||||
+ alias('signal-client-java').to('org.signald', 'signal-client-java-'+ System.getenv("TARGET")).versionRef('signal-client')
|
||||
+ alias('signal-client-java').to('org.signald', 'signal-client-java-'+ System.getenv("TARGET").replaceAll("_", "-")).versionRef('signal-client')
|
||||
|
||||
// Third Party
|
||||
alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.13.0')
|
||||
|
@ -99,7 +99,7 @@ index 77f8957..01c281e 100644
|
|||
<artifact name="tensorflow-lite-metadata-0.1.0-rc2.jar">
|
||||
<sha256 value="2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9" origin="Generated by Gradle"/>
|
||||
diff --git a/service/build.gradle b/service/build.gradle
|
||||
index db7d2eb..16b3723 100644
|
||||
index db7d2eb..35cbf13 100644
|
||||
--- a/service/build.gradle
|
||||
+++ b/service/build.gradle
|
||||
@@ -21,6 +21,7 @@ compileJava {
|
||||
|
@ -123,7 +123,7 @@ index db7d2eb..16b3723 100644
|
|||
publications {
|
||||
mavenJava(MavenPublication) {
|
||||
- artifactId = 'signal-service-java'
|
||||
+ artifactId = 'signal-service-java-' + System.getenv("TARGET")
|
||||
+ artifactId = 'signal-service-java-' + System.getenv("TARGET").replaceAll("_", "-")
|
||||
from components.java
|
||||
|
||||
pom {
|
||||
|
|
Loading…
Reference in a new issue