Skip to content

Commit

Permalink
Merge pull request #11 from ministryofjustice/feature/DPR2-1513-add-s…
Browse files Browse the repository at this point in the history
…hadowjar-to-build

[DPR2-1513] Add shadowJar to build
  • Loading branch information
stalwartstu authored Jan 20, 2025
2 parents 0c702ae + 7a5f9df commit e0d3307
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm") version "2.0.21"
id("jacoco")
id("com.github.johnrengelman.shadow") version "7.1.1" // originally 7.1.2 but downgraded since circle CI build was failing
id("com.github.johnrengelman.shadow") version "8.1.1"
id("org.barfuin.gradle.jacocolog") version "3.1.0"
id("org.owasp.dependencycheck") version "8.2.1"
}
Expand All @@ -22,7 +22,6 @@ ext {
}
*/
dependencies {
/* */
implementation("com.amazonaws:aws-java-sdk-s3:1.12.590")
implementation("com.amazonaws:aws-java-sdk-dynamodb:1.12.590")
implementation("com.amazonaws:aws-lambda-java-core:1.2.3")
Expand Down Expand Up @@ -74,6 +73,10 @@ tasks.jar {
enabled = true
}

tasks.assemble {
dependsOn(tasks.shadowJar)
}

repositories {
mavenLocal()
mavenCentral()
Expand All @@ -91,11 +94,6 @@ fun isNonStable(version: String): Boolean {
return isStable.not()
}

/*
shadowJar {
zip64 true
}
*/
tasks {
withType<Test> {
useJUnitPlatform()
Expand All @@ -112,8 +110,3 @@ project.getTasksByName("check", false).forEach {
it.dependsOn("$prefix:ktlintCheck")
}
*/
/*
assemble {
dependsOn shadowJar
}
*/

0 comments on commit e0d3307

Please sign in to comment.