From b09bf3b8b81563f55ce381f3158d8cb6aebb5cc8 Mon Sep 17 00:00:00 2001 From: Kirill Merkushev Date: Tue, 27 Jul 2021 10:27:43 +0200 Subject: [PATCH] Constant name for the app-boot.jar in app module (#989) * Constant name for a app-boot.jar * Update tck/build.gradle Co-authored-by: Sergei Egorov Co-authored-by: Sergei Egorov --- app/build.gradle | 1 + tck/build.gradle | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 927f84e8..488af528 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,6 +13,7 @@ jar { bootJar { archiveClassifier = 'boot' + archiveVersion = '' } dependencies { diff --git a/tck/build.gradle b/tck/build.gradle index ef7ac78c..e4d1059e 100644 --- a/tck/build.gradle +++ b/tck/build.gradle @@ -23,20 +23,30 @@ tasks.test.dependsOn( rootProject.project(":plugins:inmemory-records-storage").getTasksByName("jar", false) ) -processResources { +tasks.register('appDependency') { dependsOn( tasks.findByPath(":app:sourcesJar"), tasks.findByPath(":app:bootJar"), tasks.findByPath(":app:jar") ) + + doLast { + def app = tasks.findByPath(":app:bootJar").outputs.files.singleFile + if (app.name != 'app-boot.jar') { + throw new GradleException(':app:bootJar task should produce exactly "app-boot.jar" file to be included into TCK, got: ' + app.absolutePath) + } + } } +processResources.dependsOn(tasks.appDependency) + sourceSets { main { resources.srcDir tasks.findByPath(":app:bootJar").outputs.files.singleFile.parentFile + resources.include 'app-boot.jar' } } sourcesJar { dependsOn processResources -} \ No newline at end of file +}