update to unofficial_32
This commit is contained in:
parent
f3450d57ca
commit
59c0de568f
2 changed files with 35 additions and 27 deletions
|
|
@ -2,7 +2,7 @@ stages:
|
|||
- build
|
||||
|
||||
variables:
|
||||
version: "v2.15.3_unofficial_31"
|
||||
version: "v2.15.3_unofficial_32"
|
||||
GRADLE_OPTS: -Dorg.gradle.daemon=false
|
||||
|
||||
build:
|
||||
|
|
|
|||
|
|
@ -1,27 +1,26 @@
|
|||
From 52e706bcab638b77c287a68bdf0318b83f846812 Mon Sep 17 00:00:00 2001
|
||||
From: finn <finn@janky.solutions>
|
||||
Date: Tue, 26 Oct 2021 20:18:43 -0700
|
||||
From 679a423f659506e1dc3b597bb940eb5c9c12b02f Mon Sep 17 00:00:00 2001
|
||||
From: nobody <nobody@signald.org>
|
||||
Date: Mon, 8 Nov 2021 15:46:59 -0800
|
||||
Subject: [PATCH] update gradle files
|
||||
|
||||
---
|
||||
build.gradle | 10 +-------
|
||||
dependencies.gradle | 6 ++---
|
||||
service/build.gradle | 56 ++++++++------------------------------------
|
||||
service/build.gradle | 57 ++++++++------------------------------------
|
||||
settings.gradle | 2 --
|
||||
4 files changed, 13 insertions(+), 61 deletions(-)
|
||||
4 files changed, 13 insertions(+), 62 deletions(-)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index 9e69283..f559be4 100644
|
||||
index 623f06c..785dbcc 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -2,6 +2,7 @@ buildscript {
|
||||
@@ -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()
|
||||
+ 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 : ""
|
||||
}
|
||||
|
|
@ -36,14 +35,14 @@ index 9e69283..f559be4 100644
|
|||
-}
|
||||
-
|
||||
subprojects {
|
||||
ext.lib_signal_service_version_number = "2.15.3_unofficial_31"
|
||||
ext.lib_signal_service_version_number = "2.15.3_unofficial_32"
|
||||
ext.lib_signal_service_group_info = "com.github.turasa"
|
||||
diff --git a/dependencies.gradle b/dependencies.gradle
|
||||
index 0fd41a7..30b02c4 100644
|
||||
index a046f96..01adfb6 100644
|
||||
--- a/dependencies.gradle
|
||||
+++ b/dependencies.gradle
|
||||
@@ -9,10 +9,8 @@ dependencyResolutionManagement {
|
||||
alias('google-libphonenumber').to('com.googlecode.libphonenumber:libphonenumber:8.12.17')
|
||||
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')
|
||||
|
|
@ -56,25 +55,34 @@ index 0fd41a7..30b02c4 100644
|
|||
// 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
|
||||
index e354777..399b27c 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
|
||||
@@ -23,6 +23,7 @@ compileJava {
|
||||
}
|
||||
|
||||
configurations {
|
||||
@@ -104,58 +105,21 @@ def getRepositoryPassword() {
|
||||
repositories {
|
||||
+ maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
||||
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,21 @@ def getRepositoryPassword() {
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
- mavenJava(MavenPublication) {
|
||||
- artifactId = 'signal-service-java'
|
||||
+ library(MavenPublication) {
|
||||
from components.java
|
||||
- from components.java
|
||||
-
|
||||
- pom {
|
||||
- name = 'signal-service-java'
|
||||
|
|
@ -109,17 +117,17 @@ index 5222870..fa93603 100644
|
|||
- }
|
||||
- }
|
||||
-
|
||||
+ library(MavenPublication) {
|
||||
+ artifactId = archivesBaseName + "-" + System.getenv("TARGET")
|
||||
}
|
||||
}
|
||||
-
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
- url = getReleaseRepositoryUrl()
|
||||
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")
|
||||
|
|
|
|||
Loading…
Reference in a new issue