[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] branch master updated: share less build settings between grad
From: |
gnunet |
Subject: |
[libeufin] branch master updated: share less build settings between gradle modules |
Date: |
Fri, 25 Oct 2019 11:26:41 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository libeufin.
The following commit(s) were added to refs/heads/master by this push:
new 3a53d88 share less build settings between gradle modules
3a53d88 is described below
commit 3a53d8825b47d71232d6d1a4e19164515be29020
Author: Florian Dold <address@hidden>
AuthorDate: Fri Oct 25 11:24:06 2019 +0200
share less build settings between gradle modules
Each module will have its own set of dependencies, they should be
declared separately. Furthermore, the old configuration broke running
"./gradlew build" from the top level directory.
---
build.gradle | 43 -------------------------------------------
nexus/build.gradle | 45 ++++++++++++++++++++++++++++++++++++++++-----
sandbox/build.gradle | 45 +++++++++++++++++++++++++++++++++++++++------
3 files changed, 79 insertions(+), 54 deletions(-)
diff --git a/build.gradle b/build.gradle
index 6295ab1..20f963b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,49 +1,6 @@
-plugins {
- id "org.jetbrains.kotlin.jvm" version "1.3.50"
-}
-
allprojects {
- apply plugin : "org.jetbrains.kotlin.jvm"
- apply plugin : "application"
- apply plugin : "java"
-
repositories {
mavenCentral()
jcenter()
}
}
-
-subprojects {
-
- version '1.0-SNAPSHOT'
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
-
- compileKotlin {
- kotlinOptions {
- jvmTarget = "1.8"
- }
- }
-
- compileTestKotlin {
- kotlinOptions {
- jvmTarget = "1.8"
- }
- }
-
- dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
- implementation "io.ktor:ktor-gson:1.1.5"
- compile group: 'io.ktor', name: 'ktor-gson', version: '0.9.0'
- compile "org.jetbrains.exposed:exposed:0.17.3"
- compile "io.ktor:ktor-server-netty:1.2.4"
- compile "ch.qos.logback:logback-classic:1.2.3"
- compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
- compile "javax.xml.bind:jaxb-api:2.3.0"
- compile group: 'xerces', name: 'xercesImpl', version:
'2.6.2-jaxb-1.0.6'
- compile "javax.activation:activation:1.1"
- compile "org.glassfish.jaxb:jaxb-runtime:2.3.1"
- testCompile group: 'junit', name: 'junit', version: '4.12'
- runtime rootProject.files("resources")
- }
-}
\ No newline at end of file
diff --git a/nexus/build.gradle b/nexus/build.gradle
index 045c161..349561c 100644
--- a/nexus/build.gradle
+++ b/nexus/build.gradle
@@ -1,3 +1,42 @@
+plugins {
+ id 'java'
+ id 'org.jetbrains.kotlin.jvm' version '1.3.50'
+ id 'application'
+}
+
+
+version '1.0-snapshot'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+compileKotlin {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+}
+
+compileTestKotlin {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+}
+
+dependencies {
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+ implementation "io.ktor:ktor-gson:1.1.5"
+ compile group: 'io.ktor', name: 'ktor-gson', version: '0.9.0'
+ compile "org.jetbrains.exposed:exposed:0.17.3"
+ compile "io.ktor:ktor-server-netty:1.2.4"
+ compile "ch.qos.logback:logback-classic:1.2.3"
+ compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+ compile "javax.xml.bind:jaxb-api:2.3.0"
+ compile group: 'xerces', name: 'xercesImpl', version: '2.6.2-jaxb-1.0.6'
+ compile "javax.activation:activation:1.1"
+ compile "org.glassfish.jaxb:jaxb-runtime:2.3.1"
+ testCompile group: 'junit', name: 'junit', version: '4.12'
+ runtime rootProject.files("resources")
+}
+
application {
mainClassName = "tech.libeufin.nexus.MainKt"
}
@@ -11,8 +50,4 @@ jar {
manifest {
attributes "Main-Class": "tech.libeufin.nexus.MainKt"
}
-
- from {
- configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
- }
-}
\ No newline at end of file
+}
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
index 5f0b3de..876e554 100644
--- a/sandbox/build.gradle
+++ b/sandbox/build.gradle
@@ -1,3 +1,41 @@
+plugins {
+ id 'java'
+ id 'org.jetbrains.kotlin.jvm' version '1.3.50'
+ id 'application'
+}
+
+version '1.0-snapshot'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+compileKotlin {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+}
+
+compileTestKotlin {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ }
+}
+
+dependencies {
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+ implementation "io.ktor:ktor-gson:1.1.5"
+ compile group: 'io.ktor', name: 'ktor-gson', version: '0.9.0'
+ compile "org.jetbrains.exposed:exposed:0.17.3"
+ compile "io.ktor:ktor-server-netty:1.2.4"
+ compile "ch.qos.logback:logback-classic:1.2.3"
+ compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+ compile "javax.xml.bind:jaxb-api:2.3.0"
+ compile group: 'xerces', name: 'xercesImpl', version: '2.6.2-jaxb-1.0.6'
+ compile "javax.activation:activation:1.1"
+ compile "org.glassfish.jaxb:jaxb-runtime:2.3.1"
+ testCompile group: 'junit', name: 'junit', version: '4.12'
+ runtime rootProject.files("resources")
+}
+
application {
mainClassName = "tech.libeufin.sandbox.MainKt"
}
@@ -5,10 +43,5 @@ application {
jar {
manifest {
attributes "Main-Class": "tech.libeufin.sandbox.MainKt"
-
}
-
- from {
- configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
- }
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libeufin] branch master updated: share less build settings between gradle modules,
gnunet <=