Skip to content

Commit

Permalink
6.09.clean build (#6810)
Browse files Browse the repository at this point in the history
* adding cobra and fixing repos

* cleaning warnings from build
  • Loading branch information
mertonmonk authored Feb 12, 2023
1 parent 12cb8cd commit 28e2e3c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@ artifacts {
archives converterJar
}

task copyToLibs(type: Copy) {
task copyToLibs(type: Copy, dependsOn:[startScripts,distTar,distZip,installDist]) {
mustRunAfter createExe
into "$buildDir/libs"
from configurations.runtimeClasspath
}
Expand Down Expand Up @@ -693,7 +694,7 @@ allprojects {
}
// https://youtrack.jetbrains.com/issue/KT-46165
tasks.withType(org.gradle.jvm.tasks.Jar) {
duplicatesStrategy = DuplicatesStrategy.WARN
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
tasks.withType(JavaExec) {
jvmArgs += '--enable-preview'
Expand Down
11 changes: 6 additions & 5 deletions code/gradle/release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ launch4j {
downloadUrl = "https://jdk.java.net/"
}

task layoutNsisOptional(type: Copy, dependsOn: copyToOutput) {
task layoutNsisOptional(type: Copy, dependsOn: [copyToOutput]) {
description="Assemble the optional files for PCGen installations"
into nsisOptionFolder

Expand Down Expand Up @@ -408,14 +408,15 @@ task cleanNsis(type: Delete) {
}


task sourcesJar(type: Jar, dependsOn: classes) {
task sourcesJar(type: Jar, dependsOn: [classes, copyToOutput, createExe, distTar, distZip, layoutNsisBase,
startScripts]) {
duplicatesStrategy DuplicatesStrategy.INCLUDE
description = "build source jar file"
classifier = 'sources'
//classifier = 'sources'
from sourceSets.main.allSource
}

task assembleArtifacts(type: Copy, dependsOn: ['build', 'runtimeZip', 'sourcesJar',
'buildNsis']) {
task assembleArtifacts(type: Copy, dependsOn: [build, runtimeZip, sourcesJar, buildNsis]) {
description = "Create the release artifacts and get them into the release folder."
into releaseDir
// buildNsis puts the exe into the release folder directly
Expand Down

0 comments on commit 28e2e3c

Please sign in to comment.