rebuild the patch
This commit is contained in:
parent
3fded0da4e
commit
febf5a8082
2 changed files with 43 additions and 63 deletions
|
@ -5,7 +5,15 @@ variables:
|
|||
version: "v2.15.3_unofficial_31"
|
||||
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||
|
||||
.multitarget:
|
||||
build:
|
||||
image: gradle:7.2
|
||||
stage: build
|
||||
script:
|
||||
- git clone https://github.com/Turasa/libsignal-service-java
|
||||
- cd libsignal-service-java && git checkout "$version"
|
||||
- git config user.email nobody@signald.org && git config user.name signald
|
||||
- git am ../libsignal-service-java.patch
|
||||
- gradle assemble publish
|
||||
parallel:
|
||||
matrix:
|
||||
- TARGET:
|
||||
|
@ -15,18 +23,6 @@ variables:
|
|||
- armv7-unknown-linux-gnueabihf
|
||||
- x86_64-unknown-linux-gnu
|
||||
|
||||
build:
|
||||
extends: .multitarget
|
||||
image: gradle:7.2
|
||||
stage: build
|
||||
script:
|
||||
- git clone https://github.com/Turasa/libsignal-service-java
|
||||
- cd libsignal-service-java && git checkout "$version"
|
||||
- git config user.email nobody@signald.org && git config user.name signald
|
||||
- git am ../libsignal-service-java.patch
|
||||
- cd service
|
||||
- gradle assemble publish
|
||||
|
||||
build x86_64-apple-darwin:
|
||||
stage: build
|
||||
tags: [darwin-builder]
|
||||
|
@ -35,7 +31,6 @@ build x86_64-apple-darwin:
|
|||
- cd libsignal-service-java && git checkout "$version"
|
||||
- git config user.email nobody@signald.org && git config user.name signald
|
||||
- git am ../libsignal-service-java.patch
|
||||
- cd service
|
||||
- ./gradlew assemble publish
|
||||
variables:
|
||||
TARGET: x86_64-apple-darwin
|
|
@ -1,67 +1,54 @@
|
|||
From 57b26f24f4f2c9bacf086ad1aad452afb28d5c73 Mon Sep 17 00:00:00 2001
|
||||
From: signald <nobody@signald.org>
|
||||
Date: Sun, 24 Oct 2021 16:47:36 -0700
|
||||
Subject: [PATCH] update gradle configuration
|
||||
From 535a594ae5039c60c9e75539297fd6a56233ac68 Mon Sep 17 00:00:00 2001
|
||||
From: finn <finn@janky.solutions>
|
||||
Date: Tue, 26 Oct 2021 20:18:43 -0700
|
||||
Subject: [PATCH] update gradle files
|
||||
|
||||
---
|
||||
build.gradle | 1 -
|
||||
dependencies.gradle | 4 +--
|
||||
service/build.gradle | 60 +++++++++-----------------------------------
|
||||
build.gradle | 9 --------
|
||||
dependencies.gradle | 2 --
|
||||
service/build.gradle | 55 ++++++++------------------------------------
|
||||
settings.gradle | 2 --
|
||||
4 files changed, 14 insertions(+), 53 deletions(-)
|
||||
4 files changed, 9 insertions(+), 59 deletions(-)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 9e69283..b8c3b8c 100644
|
||||
index 9e69283..12973ba 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -4,7 +4,6 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
- classpath 'com.android.tools.build:gradle:7.0.2'
|
||||
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
|
||||
}
|
||||
@@ -23,15 +23,6 @@ def getRepositoryPassword() {
|
||||
return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : ""
|
||||
}
|
||||
|
||||
-nexusPublishing {
|
||||
- repositories {
|
||||
- sonatype {
|
||||
- username = getRepositoryUsername()
|
||||
- password = getRepositoryPassword()
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
subprojects {
|
||||
ext.lib_signal_service_version_number = "2.15.3_unofficial_31"
|
||||
ext.lib_signal_service_group_info = "com.github.turasa"
|
||||
diff --git a/dependencies.gradle b/dependencies.gradle
|
||||
index 0fd41a7..5b8805c 100644
|
||||
index 0fd41a7..f998cb1 100644
|
||||
--- a/dependencies.gradle
|
||||
+++ b/dependencies.gradle
|
||||
@@ -9,9 +9,9 @@ dependencyResolutionManagement {
|
||||
alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.17')
|
||||
@@ -10,9 +10,7 @@ dependencyResolutionManagement {
|
||||
|
||||
// 1st Party
|
||||
- alias('signal-client-java').to('org.whispersystems', 'signal-client-java').versionRef('signal-client')
|
||||
+ alias('signal-client-java').to('org.whispersystems', 'signal-client-java-' + System.getenv("TARGET")).versionRef('signal-client')
|
||||
alias('signal-client-android').to('org.whispersystems', 'signal-client-android').versionRef('signal-client')
|
||||
- alias('signal-zkgroup-java').to('org.signal', 'zkgroup-java').versionRef('zkgroup')
|
||||
+ alias('signal-zkgroup-java').to('org.signal', 'zkgroup-java-' + System.getenv("TARGET")).versionRef('zkgroup')
|
||||
alias('signal-zkgroup-android').to('org.signal', 'zkgroup-android').versionRef('zkgroup')
|
||||
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-zkgroup-java').to('org.signal', 'zkgroup-java').versionRef('zkgroup')
|
||||
- alias('signal-zkgroup-android').to('org.signal', 'zkgroup-android').versionRef('zkgroup')
|
||||
|
||||
// Third Party
|
||||
alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.9.9.2')
|
||||
diff --git a/service/build.gradle b/service/build.gradle
|
||||
index 5222870..9ce10be 100644
|
||||
index 5222870..50fca33 100644
|
||||
--- a/service/build.gradle
|
||||
+++ b/service/build.gradle
|
||||
@@ -2,9 +2,9 @@ apply plugin: 'java-library'
|
||||
apply plugin: 'java-test-fixtures'
|
||||
apply plugin: 'com.google.protobuf'
|
||||
apply plugin: 'maven-publish'
|
||||
-apply plugin: 'signing'
|
||||
apply plugin: 'witness'
|
||||
apply plugin: 'idea'
|
||||
+apply plugin: 'maven-publish'
|
||||
apply from: 'witness-verifications.gradle'
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
@@ -23,6 +23,7 @@ compileJava {
|
||||
}
|
||||
|
||||
repositories {
|
||||
+ maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
}
|
||||
@@ -104,58 +105,21 @@ def getRepositoryPassword() {
|
||||
@@ -104,58 +104,21 @@ def getRepositoryPassword() {
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
|
@ -123,14 +110,12 @@ index 5222870..9ce10be 100644
|
|||
}
|
||||
}
|
||||
}
|
||||
-}
|
||||
}
|
||||
-
|
||||
-signing {
|
||||
- required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
|
||||
- sign publishing.publications.mavenJava
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/settings.gradle b/settings.gradle
|
||||
index 8861c00..4048aab 100644
|
||||
--- a/settings.gradle
|
||||
|
|
Loading…
Reference in a new issue