Skip to content

Commit

Permalink
Merge branch 'to/#98-fat-jar' into to/#2-time-range-configuration
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
  • Loading branch information
t-ober committed Mar 30, 2022
2 parents 8529146 + 14483ee commit 2e441cc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 17 deletions.
14 changes: 10 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ plugins {
id 'jacoco' // java code coverage plugin
id "org.sonarqube" version "3.3" // sonarqube
id "kr.motd.sphinx" version "2.10.0"
id "com.github.johnrengelman.shadow" version "6.1.0" // fat jar
}

ext {
Expand All @@ -32,13 +33,11 @@ defaultTasks 'build'
sourceCompatibility = javaVersion
targetCompatibility = javaVersion


apply from: scriptsLocation + 'pmd.gradle'
apply from: scriptsLocation + 'spotbugs.gradle'
apply from: scriptsLocation + 'spotless.gradle'
apply from: scriptsLocation + 'modernizer.gradle'
apply from: scriptsLocation + 'checkJavaVersion.gradle'
apply from: scriptsLocation + 'fatJar.gradle'
apply from: scriptsLocation + 'tests.gradle'
apply from: scriptsLocation + 'jacoco.gradle' // jacoco java code coverage
apply from: scriptsLocation + 'sonarqube.gradle' // sonarqube config
Expand Down Expand Up @@ -126,7 +125,7 @@ publishing {
from components.java
artifact sourcesJar
artifact javadocJar
artifact fatJar
artifact shadowJar
versionMapping {
usage('java-api') {
fromResolutionOf('runtimeClasspath')
Expand All @@ -152,7 +151,7 @@ tasks.withType(JavaCompile) {
}

application {
mainClassName = mainClass
mainClassName = "edu.ie3.tools.Main"
}

jar {
Expand All @@ -167,3 +166,10 @@ run {
// Gradle uses an empty Input as default, leading to a non-blocking behaviour and thus an immediate shutdown
standardInput = System.in
}

shadowJar {
transform(AppendingTransformer) {
resource = 'reference.conf'
}
zip64 = true
}
13 changes: 0 additions & 13 deletions gradle/scripts/fatJar.gradle

This file was deleted.

0 comments on commit 2e441cc

Please sign in to comment.