2021-10-24 19:47:40 +00:00
|
|
|
From 35c2ba78108d4a7d6527bfe6eba62298f49dfc2c Mon Sep 17 00:00:00 2001
|
2021-10-15 07:26:35 +00:00
|
|
|
From: signald <nobody@signald.org>
|
2021-10-24 19:47:40 +00:00
|
|
|
Date: Sun, 24 Oct 2021 12:45:54 -0700
|
|
|
|
Subject: [PATCH] update gradle files
|
2021-10-15 07:26:35 +00:00
|
|
|
|
|
|
|
---
|
2021-10-24 19:47:40 +00:00
|
|
|
java/build.gradle | 9 +--------
|
|
|
|
java/java/build.gradle | 22 ++++++++++++++++++++++
|
|
|
|
2 files changed, 23 insertions(+), 8 deletions(-)
|
2021-10-15 07:26:35 +00:00
|
|
|
|
|
|
|
diff --git a/java/build.gradle b/java/build.gradle
|
2021-10-24 19:47:40 +00:00
|
|
|
index 8c8eefb..3c1c7d9 100644
|
2021-10-15 07:26:35 +00:00
|
|
|
--- a/java/build.gradle
|
|
|
|
+++ b/java/build.gradle
|
2021-10-24 19:47:40 +00:00
|
|
|
@@ -11,13 +11,6 @@ subprojects {
|
2021-10-15 07:26:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
-task makeJniLibrariesAndroid(type:Exec) {
|
|
|
|
- group 'Rust'
|
|
|
|
- description 'Build the JNI libraries'
|
|
|
|
-
|
|
|
|
- commandLine './build_jni.sh', 'android'
|
|
|
|
-}
|
|
|
|
-
|
2021-10-24 19:47:40 +00:00
|
|
|
task makeJniLibrariesDesktop(type:Exec) {
|
|
|
|
group 'Rust'
|
|
|
|
description 'Build the JNI libraries'
|
|
|
|
@@ -41,5 +34,5 @@ task makeAll() {
|
2021-10-15 07:26:35 +00:00
|
|
|
group 'Rust'
|
|
|
|
description 'Build the native libraries'
|
|
|
|
|
2021-10-24 19:47:40 +00:00
|
|
|
- dependsOn 'makeJniLibrariesDesktop', 'makeJniLibrariesAndroid'
|
|
|
|
+ dependsOn 'makeJniLibrariesDesktop'
|
2021-10-15 07:26:35 +00:00
|
|
|
}
|
|
|
|
diff --git a/java/java/build.gradle b/java/java/build.gradle
|
2021-10-24 19:47:40 +00:00
|
|
|
index 2f31542..79e50e1 100644
|
2021-10-15 07:26:35 +00:00
|
|
|
--- a/java/java/build.gradle
|
|
|
|
+++ b/java/java/build.gradle
|
|
|
|
@@ -8,6 +8,7 @@ buildscript {
|
|
|
|
apply plugin: 'java'
|
|
|
|
apply plugin: 'maven'
|
|
|
|
apply plugin: 'signing'
|
|
|
|
+apply plugin: 'maven-publish'
|
|
|
|
|
|
|
|
sourceCompatibility = 1.7
|
|
|
|
archivesBaseName = "signal-client-java"
|
2021-10-24 19:47:40 +00:00
|
|
|
@@ -136,3 +137,24 @@ artifacts {
|
|
|
|
tasks.withType(JavaCompile) {
|
|
|
|
compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
|
2021-10-15 07:26:35 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+publishing {
|
|
|
|
+ publications {
|
|
|
|
+ library(MavenPublication) {
|
|
|
|
+ from components.java
|
|
|
|
+ artifactId = archivesBaseName + "-" + System.getenv("TARGET")
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ repositories {
|
|
|
|
+ maven {
|
|
|
|
+ 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)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
2021-10-24 19:47:40 +00:00
|
|
|
+}
|
2021-10-15 07:26:35 +00:00
|
|
|
--
|
|
|
|
2.20.1
|
|
|
|
|