diff --git a/build.gradle.kts b/build.gradle.kts index 72ce28fe4..4f1beadd2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -248,9 +248,7 @@ subprojects { } } } - if (this.name == "xodus-tools") { - artifact(tasks.getByName("shadowJar")) - } + } } } diff --git a/tools/build.gradle.kts b/tools/build.gradle.kts index 8777d4252..c544d3d11 100644 --- a/tools/build.gradle.kts +++ b/tools/build.gradle.kts @@ -16,13 +16,16 @@ val testArtifacts: Configuration by configurations.creating tasks { shadowJar { + mustRunAfter(jar) + archiveFileName.set(jar.get().archiveFileName) manifest { attributes["Main-Class"] = "jetbrains.exodus.MainKt" } } + jar { - enabled = false + finalizedBy(shadowJar) } val jarTest by creating(Jar::class) { @@ -34,8 +37,4 @@ tasks { add("default", shadowJar) add("testArtifacts", jarTest) } - - build { - dependsOn(shadowJar) - } } \ No newline at end of file