aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRubbaBoy <[email protected]>2020-07-07 01:34:34 -0400
committerPhil Burk <[email protected]>2020-10-30 11:19:34 -0700
commitf88eb02b61ecdfad334582f1ae5b1178a06671ce (patch)
treeb7ef66936fe46529470ca82d9f055b36c3e09520
parent46c93bf04a5a6a2ad24be9bcf47581dd75a9232e (diff)
Removed shadow jar
-rw-r--r--DEVELOPING.md2
-rw-r--r--build.gradle14
-rw-r--r--src/main/resources/log4j.xml15
3 files changed, 25 insertions, 6 deletions
diff --git a/DEVELOPING.md b/DEVELOPING.md
index 5dc7202..804a28b 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -17,7 +17,7 @@ With the new inclusion of Gradle replacing ant (bye bye 2014) this brings some m
### Building Jar
```
-./gradlew shadowJar
+./gradlew jar
```
### Publish To Maven Local
diff --git a/build.gradle b/build.gradle
index 863f7ce..32bf228 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,6 @@ plugins {
id 'java'
id 'application'
id 'maven-publish'
- id 'com.github.johnrengelman.shadow' version '6.0.0'
}
group = 'com.jsyn'
@@ -17,10 +16,13 @@ repositories {
dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
- testImplementation 'org.slf4j:slf4j-log4j12:1.7.25'
implementation 'org.slf4j:slf4j-api:1.7.25'
+ // I'm unsure weather or not to keep the logging implementation here and not as a 'testImplementation', as libraries
+ // aren't usually meant to be ran.
+ implementation 'org.slf4j:slf4j-log4j12:1.7.25'
+
implementation fileTree(dir: 'libs', include: '*.jar')
}
@@ -30,6 +32,7 @@ publishing {
from components.java
}
}
+
repositories {
mavenLocal()
}
@@ -39,9 +42,10 @@ jar {
manifest {
attributes('Main-Class': mainClassName)
}
-}
-shadowJar {
- archiveFileName = "jysn-${version}.jar";
+
+ from {
+ configurations.compileClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+ }
}
javadoc {
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
new file mode 100644
index 0000000..43fb2e0
--- /dev/null
+++ b/src/main/resources/log4j.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration debug="false">
+ <appender name="default.console" class="org.apache.log4j.ConsoleAppender">
+ <param name="target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{HH:mm:ss}] [%t/%p]: %m%n"/>
+ </layout>
+ </appender>
+
+ <root>
+ <priority value="DEBUG" />
+ <appender-ref ref="default.console"/>
+ </root>
+</log4j:configuration>