gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libeufin] branch master updated: distributing sources


From: gnunet
Subject: [libeufin] branch master updated: distributing sources
Date: Tue, 17 Jan 2023 18:06:18 +0100

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new bb485263 distributing sources
bb485263 is described below

commit bb485263833445d93ae2d5bba71b55bfdc18367a
Author: MS <ms@taler.net>
AuthorDate: Tue Jan 17 18:04:08 2023 +0100

    distributing sources
    
    instructing the root project to include
    sources and build.gradle files from subprojects.
---
 build.gradle         | 26 ++++++++++++++++++--------
 nexus/build.gradle   |  2 +-
 sandbox/build.gradle |  7 ++-----
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 58d8fd0e..d5628e23 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,11 +20,6 @@ if (!JavaVersion.current().isJava11Compatible()){
         "or later (your version is java ${JavaVersion.current()})")
 }
 
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
 allprojects {
     ext.set("ktor_version", "2.2.1")
     ext.set("ktor_auth_version", "1.6.8")
@@ -42,7 +37,6 @@ idea {
     }
 }
 
-
 task versionFile() {
     new File("${projectDir}/util/src/main/resources", "version.txt").text = 
getRootProject().version
 }
@@ -68,7 +62,7 @@ task dist(type: Zip) {
     subprojects.each {
         if (it.name == "nexus" || it.name == "sandbox") {
             Task t = it.tasks.getByName("installShadowDist")
-            dependsOn(t)
+            dependsOn(t) // invokes the task 't'
         }
     }
     from("nexus/build/install/nexus-shadow") {
@@ -86,12 +80,28 @@ task dist(type: Zip) {
     into(topDir)
 }
 
+task libeufinSrcJar(type: Jar) {
+    archiveClassifier = "sources"
+    from project("sandbox").sourceSets.main.java.srcDirs
+    from project("nexus").sourceSets.main.java.srcDirs
+    from("sandbox") {
+        include("build.gradle")
+        into("sandbox")
+    }
+    from("nexus") {
+        include("build.gradle")
+        into("nexus")
+    }
+    from "build.gradle"
+    from "settings.gradle"
+}
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
             artifactId = 'libeufin'
-            from components.java
+            // from components.java
+            artifact libeufinSrcJar
             versionMapping {
                 usage('java-api') {
                     fromResolutionOf('runtimeClasspath')
diff --git a/nexus/build.gradle b/nexus/build.gradle
index 4942ecce..6601e1d4 100644
--- a/nexus/build.gradle
+++ b/nexus/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 sourceSets {
-    main.kotlin.srcDirs = ["src/main/kotlin"]
+    main.java.srcDirs = ['src/main/kotlin']
 }
 
 task installToPrefix(type: Copy) {
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index c87bdf53..9f561600 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -39,10 +39,7 @@ task installToPrefix(type: Copy) {
 apply plugin: 'kotlin-kapt'
 
 sourceSets {
-    main.java.srcDirs = [
-            'src/main/java',
-            'src/main/kotlin'
-    ]
+    main.java.srcDirs = ['src/main/kotlin']
 }
 
 dependencies {
@@ -92,4 +89,4 @@ jar {
     manifest {
         attributes "Main-Class": "tech.libeufin.sandbox.MainKt"
     }
-}
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]