From f43d826dc39e172db303aab5c0db73d11a43a6d2 Mon Sep 17 00:00:00 2001
From: signald <nobody@signald.org>
Date: Mon, 21 Mar 2022 18:40:29 -0700
Subject: [PATCH] update gradle files

---
 build.gradle                     | 18 +++---------------
 dependencies.gradle              |  3 +--
 gradle/verification-metadata.xml | 19 +++++++++++--------
 service/build.gradle             | 21 ++++++++++-----------
 settings.gradle                  |  1 -
 5 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7b6a436..6641bb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
 buildscript {
     repositories {
+        maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
         google()
         mavenCentral()
     }
@@ -9,11 +10,7 @@ buildscript {
     }
 }
 
-plugins {
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
-}
-
-project.group = "com.github.turasa"
+project.group = "org.signald"
 
 def getRepositoryUsername() {
     return hasProperty('whisperSonatypeUsername') ? whisperSonatypeUsername : ""
@@ -23,18 +20,9 @@ def getRepositoryPassword() {
     return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : ""
 }
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            username = getRepositoryUsername()
-            password = getRepositoryPassword()
-        }
-    }
-}
-
 subprojects {
     ext.lib_signal_service_version_number = "2.15.3_unofficial_45"
-    ext.lib_signal_service_group_info     = "com.github.turasa"
+    ext.lib_signal_service_group_info     = "org.signald"
 
     if (JavaVersion.current().isJava8Compatible()) {
         allprojects {
diff --git a/dependencies.gradle b/dependencies.gradle
index d468f38..1f0ba1b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -8,8 +8,7 @@ dependencyResolutionManagement {
             alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.33')
 
             // 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')
 
             // Third Party
             alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.13.0')
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 261b8e2..fb92055 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -482,6 +482,9 @@
          <artifact name="protoc-3.18.0-linux-x86_64.exe">
             <sha256 value="e977a0b300a3b0c7c0135a02b8a4d746081e1cd8946ea747e0247412535692fe" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="protoc-3.18.0-osx-x86_64.exe">
+            <sha256 value="956241e25cac149cf8d01d4f9125f2913b3bc471deea6856231367cdf4be71a4" origin="Generated by Gradle"/>
+         </artifact>
       </component>
       <component group="com.google.testing.platform" name="core-proto" version="0.0.8-alpha04">
          <artifact name="core-proto-0.0.8-alpha04.jar">
@@ -1130,6 +1133,14 @@
             <sha256 value="2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.signald" name="signal-client-java-{TARGET}" version="0.14.0">
+         <artifact name="signal-client-java-{TARGET}-0.14.0.jar">
+            <sha256 value="{TARGET_JAR_SHA256}" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="signal-client-java-{TARGET}-0.14.0.module">
+            <sha256 value="{TARGET_MODULE_SHA256}" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.testng" name="testng" version="7.3.0">
          <artifact name="testng-7.3.0.jar">
             <sha256 value="63727488f9717d57f0d0a0fee5a1fc10a2be9cfcff2ec3a7187656d663c0774e" origin="Generated by Gradle"/>
@@ -1148,14 +1159,6 @@
             <sha256 value="ebcdde2d03c677dbefd612819b8cf477cbb35872f1d59d4ab61bda3d56a9c87f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.whispersystems" name="signal-client-java" version="0.14.0">
-         <artifact name="signal-client-java-0.14.0.jar">
-            <sha256 value="c9e98d95d427caac518ad9ae0300502ae76cc228def2dd2ada0c23f52b8dfed6" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="signal-client-java-0.14.0.module">
-            <sha256 value="9f0b7ab60329b9049c19f6f762a3e603df287662247a2317f7dea657ff749b2f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="xerces" name="xercesImpl" version="2.12.0">
          <artifact name="xercesImpl-2.12.0.jar">
             <sha256 value="b50d3a4ca502faa4d1c838acb8aa9480446953421f7327e338c5dda3da5e76d0" origin="Generated by Gradle"/>
diff --git a/service/build.gradle b/service/build.gradle
index db7d2eb..8e6d0d1 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -21,6 +21,7 @@ compileJava {
 }
 
 repositories {
+    maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
     mavenCentral()
     mavenLocal()
 }
@@ -98,7 +99,7 @@ def getRepositoryPassword() {
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifactId = 'signal-service-java'
+            artifactId = 'signal-service-java-' + System.getenv("TARGET")
             from components.java
 
             pom {
@@ -139,16 +140,14 @@ publishing {
 
     repositories {
         maven {
-            url = getReleaseRepositoryUrl()
-            credentials {
-                username getRepositoryUsername()
-                password getRepositoryPassword()
+            url System.getenv("CI_API_V4_URL") + "/projects/" + System.getenv("CI_PROJECT_ID") + "/packages/maven"
+            credentials(HttpHeaderCredentials) {
+                name = 'Job-Token'
+                value = System.getenv("CI_JOB_TOKEN")
+            }
+            authentication {
+                 header(HttpHeaderAuthentication)
             }
         }
     }
-}
-
-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..8dd0342 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,5 @@
 enableFeaturePreview('VERSION_CATALOGS')
 
-include ':android'
 
 include 'libsignal-service'
 project(':libsignal-service').projectDir = file('service')
-- 
2.30.2