mirror of
https://gitlab.com/signald/libraries/libsignal-client.git
synced 2024-12-04 19:46:37 +00:00
84 lines
2.2 KiB
Diff
84 lines
2.2 KiB
Diff
From 46c6a177211022656abcbb30001044b7592b2552 Mon Sep 17 00:00:00 2001
|
|
From: signald <nobody@signald.org>
|
|
Date: Thu, 20 May 2021 23:56:48 -0700
|
|
Subject: [PATCH] Update gradle files
|
|
|
|
---
|
|
java/build.gradle | 16 +---------------
|
|
java/java/build.gradle | 23 +++++++++++++++++++++--
|
|
2 files changed, 22 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/java/build.gradle b/java/build.gradle
|
|
index a88e374..b89a098 100644
|
|
--- a/java/build.gradle
|
|
+++ b/java/build.gradle
|
|
@@ -11,20 +11,6 @@ subprojects {
|
|
}
|
|
}
|
|
|
|
-task makeJniLibrariesAndroid(type:Exec) {
|
|
- group 'Rust'
|
|
- description 'Build the JNI libraries'
|
|
-
|
|
- commandLine './build_jni.sh', 'android'
|
|
-}
|
|
-
|
|
-task makeJniLibrariesDesktop(type:Exec) {
|
|
- group 'Rust'
|
|
- description 'Build the JNI libraries'
|
|
-
|
|
- commandLine './build_jni.sh', 'desktop'
|
|
-}
|
|
-
|
|
task clean(type: Delete) {
|
|
description 'Clean JNI libs'
|
|
delete fileTree('./android/src/main/jniLibs') {
|
|
@@ -41,5 +27,5 @@ task makeAll() {
|
|
group 'Rust'
|
|
description 'Build the native libraries'
|
|
|
|
- dependsOn 'makeDesktop', 'makeAndroid'
|
|
+ dependsOn 'makeDesktop'
|
|
}
|
|
diff --git a/java/java/build.gradle b/java/java/build.gradle
|
|
index 2f31542..ba4bdbc 100644
|
|
--- 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"
|
|
@@ -133,6 +134,24 @@ artifacts {
|
|
archives packageSources
|
|
}
|
|
|
|
-tasks.withType(JavaCompile) {
|
|
- compileTask -> compileTask.dependsOn ':makeJniLibrariesDesktop'
|
|
+
|
|
+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)
|
|
+ }
|
|
+ }
|
|
+ }
|
|
}
|
|
--
|
|
2.20.1
|
|
|