From 72d0fbe550511d1f7ee814f7306efd58f78f9f56 Mon Sep 17 00:00:00 2001
From: Christian Basler
Date: Thu, 18 Jun 2015 21:26:08 +0200
Subject: [PATCH] Version 0.1.0 bump Updated Gradle file structure so the
version and a few other things are only defined once
---
build.gradle | 35 ++++++++++++++-----
demo/build.gradle | 10 ++----
domain/build.gradle | 9 -----
.../dissem/bitmessage/BitmessageContext.java | 2 --
networking/build.gradle | 9 -----
repositories/build.gradle | 9 -----
6 files changed, 29 insertions(+), 45 deletions(-)
diff --git a/build.gradle b/build.gradle
index e5feb85..0e9b050 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,31 @@
-apply plugin: 'java'
+allprojects {
+ apply plugin: 'java'
+ apply plugin: 'maven'
+ apply plugin: 'signing'
-sourceCompatibility = 1.7
-version = '0.0.1'
+ sourceCompatibility = 1.7
+ group = 'ch.dissem.jabit'
+ version = '0.1.0'
-repositories {
- mavenCentral()
-}
+ repositories {
+ mavenCentral()
+ }
-dependencies {
- testCompile 'junit:junit:4.11'
+ task javadocJar(type: Jar) {
+ classifier = 'javadoc'
+ from javadoc
+ }
+
+ task sourcesJar(type: Jar) {
+ classifier = 'sources'
+ from sourceSets.main.allSource
+ }
+
+ artifacts {
+ archives javadocJar, sourcesJar
+ }
+
+// signing {
+// sign configurations.archives
+// }
}
\ No newline at end of file
diff --git a/demo/build.gradle b/demo/build.gradle
index 3c7930f..ae7579e 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -6,17 +6,11 @@ task fatCapsule(type: FatCapsule) {
applicationClass 'ch.dissem.bitmessage.demo.Main'
}
-sourceCompatibility = 1.7
-version = '0.0.1'
-
-repositories {
- mavenCentral()
-}
-
dependencies {
compile project(':domain')
compile project(':networking')
compile project(':repositories')
compile 'org.slf4j:slf4j-simple:1.7.12'
+ compile 'args4j:args4j:2.32'
testCompile 'junit:junit:4.11'
-}
\ No newline at end of file
+}
diff --git a/domain/build.gradle b/domain/build.gradle
index 4285926..215798a 100644
--- a/domain/build.gradle
+++ b/domain/build.gradle
@@ -1,12 +1,3 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-version = '0.0.1'
-
-repositories {
- mavenCentral()
-}
-
dependencies {
compile 'org.slf4j:slf4j-api:1.7.12'
compile 'org.bouncycastle:bcprov-jdk15on:1.52'
diff --git a/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 4b1b0b6..5414836 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -55,10 +55,8 @@ import static ch.dissem.bitmessage.utils.UnixTime.DAY;
* streams
*
* The default implementations in the different module builds can be used.
- *
*
* The port defaults to 8444 (the default Bitmessage port)
- *
*/
public class BitmessageContext {
public static final int CURRENT_VERSION = 3;
diff --git a/networking/build.gradle b/networking/build.gradle
index 0a8d301..3b5def4 100644
--- a/networking/build.gradle
+++ b/networking/build.gradle
@@ -1,12 +1,3 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-version = '0.0.1'
-
-repositories {
- mavenCentral()
-}
-
dependencies {
compile project(':domain')
testCompile 'org.slf4j:slf4j-simple:1.7.12'
diff --git a/repositories/build.gradle b/repositories/build.gradle
index 4908b0b..231dbdb 100644
--- a/repositories/build.gradle
+++ b/repositories/build.gradle
@@ -1,12 +1,3 @@
-apply plugin: 'java'
-
-sourceCompatibility = 1.7
-version = '0.0.1'
-
-repositories {
- mavenCentral()
-}
-
dependencies {
compile project(':domain')
compile 'com.h2database:h2:1.4.187'