From 52e706bcab638b77c287a68bdf0318b83f846812 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         | 10 +-------
 dependencies.gradle  |  6 ++---
 service/build.gradle | 56 ++++++++------------------------------------
 settings.gradle      |  2 --
 4 files changed, 13 insertions(+), 61 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9e69283..f559be4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.2'
@@ -23,15 +24,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..30b02c4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -9,10 +9,8 @@ dependencyResolutionManagement {
             alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.17')
 
             // 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-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 5222870..fa93603 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -25,6 +25,7 @@ compileJava {
 repositories {
     mavenCentral()
     mavenLocal()
+    maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
 }
 
 configurations {
@@ -104,58 +105,21 @@ def getRepositoryPassword() {
 
 publishing {
     publications {
-        mavenJava(MavenPublication) {
-            artifactId = 'signal-service-java'
+        library(MavenPublication) {
             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")
         }
     }
-
     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
-}
diff --git a/settings.gradle b/settings.gradle
index 8861c00..4048aab 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,5 @@
 enableFeaturePreview('VERSION_CATALOGS')
 
-include ':android'
-
 include 'libsignal-service'
 project(':libsignal-service').projectDir = file('service')
 
-- 
2.20.1