update to unofficial_34

First build without zkgroup (now merged into libsignal-client)

.gitlab-ci.yml

@@ -2,7 +2,7 @@ stages:
   - build
 
 variables:
-  version: "v2.15.3_unofficial_32"
+  version: "v2.15.3_unofficial_34"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 build:

libsignal-service-java.patch

@@ -1,17 +1,17 @@
-From 9ce0feeff07daedd1772abdf6aea9f68fdf600b0 Mon Sep 17 00:00:00 2001
-From: nobody <nobody@signald.org>
-Date: Mon, 8 Nov 2021 15:46:59 -0800
+From 45feb51252f1f98a6b3ec1ada840598e65622814 Mon Sep 17 00:00:00 2001
+From: finn <finn@janky.solutions>
+Date: Thu, 18 Nov 2021 18:55:31 -0800
 Subject: [PATCH] update gradle files
 
 ---
- build.gradle         | 10 +-------
- dependencies.gradle  |  6 ++---
- service/build.gradle | 56 ++++++++------------------------------------
- settings.gradle      |  2 --
- 4 files changed, 13 insertions(+), 61 deletions(-)
+ build.gradle         | 10 +---------
+ dependencies.gradle  |  1 -
+ service/build.gradle | 20 +++++++++-----------
+ settings.gradle      |  2 +-
+ 4 files changed, 11 insertions(+), 22 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index 623f06c..785dbcc 100644
+index 5a4cded..a1d8d70 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -1,5 +1,6 @@
@@ -35,27 +35,22 @@ index 623f06c..785dbcc 100644
 -}
 -
  subprojects {
-     ext.lib_signal_service_version_number = "2.15.3_unofficial_32"
+     ext.lib_signal_service_version_number = "2.15.3_unofficial_34"
      ext.lib_signal_service_group_info     = "com.github.turasa"
 diff --git a/dependencies.gradle b/dependencies.gradle
-index a046f96..01adfb6 100644
+index c1288ca..f32a970 100644
 --- a/dependencies.gradle
 +++ b/dependencies.gradle
-@@ -9,10 +9,8 @@ dependencyResolutionManagement {
-             alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.33')
+@@ -9,7 +9,6 @@ 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').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')
-+            alias('signal-client-java').to('org.whispersystems', 'signal-client-java-' + System.getenv("TARGET")).versionRef('signal-client')
-+            alias('signal-zkgroup-java').to('org.signal', 'zkgroup-java-' + System.getenv("TARGET")).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 e354777..890d781 100644
+index 98377c1..cd7e807 100644
 --- a/service/build.gradle
 +++ b/service/build.gradle
 @@ -23,6 +23,7 @@ compileJava {
@@ -66,65 +61,22 @@ index e354777..890d781 100644
      mavenCentral()
      mavenLocal()
  }
-@@ -91,8 +92,7 @@ def isReleaseBuild() {
- }
- 
- def getReleaseRepositoryUrl() {
--    return hasProperty('sonatypeRepo') ? sonatypeRepo
--            : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-+    return System.getenv("CI_API_V4_URL") + "/projects/" + System.getenv("CI_PROJECT_ID") + "/packages/maven"
- }
- 
- def getRepositoryUsername() {
-@@ -105,58 +105,22 @@ def getRepositoryPassword() {
+@@ -103,8 +104,8 @@ def getRepositoryPassword() {
  
  publishing {
      publications {
 -        mavenJava(MavenPublication) {
 -            artifactId = 'signal-service-java'
 +        library(MavenPublication) {
++            artifactId = 'signal-service-java'+ "-" + System.getenv("TARGET")
              from components.java
--
--            pom {
--                name = 'signal-service-java'
--                packaging = 'jar'
--                description = 'Signal Service communication library for Java, unofficial fork'
--                url = 'https://github.com/Turasa/libsignal-service-java'
--
--                scm {
--                    url = 'scm:git@github.com:Turasa/libsignal-service-java.git'
--                    connection = 'scm:git@github.com:Turasa/libsignal-service-java.git'
--                    developerConnection = 'scm:git@github.com:Turasa/libsignal-service-java.git'
--                }
--
--                licenses {
--                    license {
--                        name = 'GPLv3'
--                        url = 'https://www.gnu.org/licenses/gpl-3.0.txt'
--                        distribution = 'repo'
--                    }
--                }
--
--                developers {
--                    developer {
--                        name = 'Moxie Marlinspike'
--                    }
--                    developer {
--                        name = 'Sebastian Scheibner'
--                    }
--                    developer {
--                        name = 'Tilman Hoffbauer'
--                    }
--                }
--            }
--
-+            artifactId = archivesBaseName + "-" + System.getenv("TARGET")
-         }
-     }
+ 
+             pom {
+@@ -145,16 +146,13 @@ publishing {
  
      repositories {
          maven {
-             url = getReleaseRepositoryUrl()
+-            url = getReleaseRepositoryUrl()
 -            credentials {
 -                username getRepositoryUsername()
 -                password getRepositoryPassword()
@@ -144,17 +96,17 @@ index e354777..890d781 100644
 -    sign publishing.publications.mavenJava
 -}
 diff --git a/settings.gradle b/settings.gradle
-index 8861c00..4048aab 100644
+index 8861c00..c180376 100644
 --- a/settings.gradle
 +++ b/settings.gradle
-@@ -1,7 +1,5 @@
+@@ -1,6 +1,6 @@
  enableFeaturePreview('VERSION_CATALOGS')
  
 -include ':android'
--
++
+ 
  include 'libsignal-service'
  project(':libsignal-service').projectDir = file('service')
- 
 -- 
 2.20.1