fix specifying components maybe

This commit is contained in:
finn 2021-11-08 16:53:59 -08:00
parent 59c0de568f
commit cae3354a61

View file

@ -1,4 +1,4 @@
From 679a423f659506e1dc3b597bb940eb5c9c12b02f Mon Sep 17 00:00:00 2001 From 9ce0feeff07daedd1772abdf6aea9f68fdf600b0 Mon Sep 17 00:00:00 2001
From: nobody <nobody@signald.org> From: nobody <nobody@signald.org>
Date: Mon, 8 Nov 2021 15:46:59 -0800 Date: Mon, 8 Nov 2021 15:46:59 -0800
Subject: [PATCH] update gradle files Subject: [PATCH] update gradle files
@ -6,9 +6,9 @@ Subject: [PATCH] update gradle files
--- ---
build.gradle | 10 +------- build.gradle | 10 +-------
dependencies.gradle | 6 ++--- dependencies.gradle | 6 ++---
service/build.gradle | 57 ++++++++------------------------------------ service/build.gradle | 56 ++++++++------------------------------------
settings.gradle | 2 -- settings.gradle | 2 --
4 files changed, 13 insertions(+), 62 deletions(-) 4 files changed, 13 insertions(+), 61 deletions(-)
diff --git a/build.gradle b/build.gradle diff --git a/build.gradle b/build.gradle
index 623f06c..785dbcc 100644 index 623f06c..785dbcc 100644
@ -55,7 +55,7 @@ index a046f96..01adfb6 100644
// Third Party // Third Party
alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.9.9.2') alias('jackson-core').to('com.fasterxml.jackson.core:jackson-databind:2.9.9.2')
diff --git a/service/build.gradle b/service/build.gradle diff --git a/service/build.gradle b/service/build.gradle
index e354777..399b27c 100644 index e354777..890d781 100644
--- a/service/build.gradle --- a/service/build.gradle
+++ b/service/build.gradle +++ b/service/build.gradle
@@ -23,6 +23,7 @@ compileJava { @@ -23,6 +23,7 @@ compileJava {
@ -76,13 +76,14 @@ index e354777..399b27c 100644
} }
def getRepositoryUsername() { def getRepositoryUsername() {
@@ -105,58 +105,21 @@ def getRepositoryPassword() { @@ -105,58 +105,22 @@ def getRepositoryPassword() {
publishing { publishing {
publications { publications {
- mavenJava(MavenPublication) { - mavenJava(MavenPublication) {
- artifactId = 'signal-service-java' - artifactId = 'signal-service-java'
- from components.java + library(MavenPublication) {
from components.java
- -
- pom { - pom {
- name = 'signal-service-java' - name = 'signal-service-java'
@ -117,7 +118,6 @@ index e354777..399b27c 100644
- } - }
- } - }
- -
+ library(MavenPublication) {
+ artifactId = archivesBaseName + "-" + System.getenv("TARGET") + artifactId = archivesBaseName + "-" + System.getenv("TARGET")
} }
} }