fix: replace deprecated dependencyProject.path with .path
diff --git a/build.gradle.kts b/build.gradle.kts
index 50ac413..d34c1aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,7 +44,7 @@
setOf(
projects.src.bom,
projects.src.bomThirdparty,
- ).mapTo(mutableSetOf()) { it.dependencyProject }
+ ).mapTo(mutableSetOf()) { it.path }
}
val notPublishedProjects by extra {
@@ -62,35 +62,11 @@
projects.src.testkit,
projects.src.testkitWiremock,
projects.src.testServices,
- ).mapTo(mutableSetOf()) { it.dependencyProject }
+ ).mapTo(mutableSetOf()) { it.path }
}
val publishedProjects by extra {
- allprojects - notPublishedProjects
-}
-
-notPublishedProjects.forEach { project ->
- if (project != rootProject) {
- project.plugins.withId("maven-publish") {
- throw IllegalStateException(
- "Project ${project.path} is listed in notPublishedProjects, however it has maven-publish plugin applied. " +
- "Please remove maven-publish plugin (e.g. replace build-logic.jvm-published-library with build-logic.jvm-library) or " +
- "move the project to the list of published ones"
- )
- }
- }
-}
-
-publishedProjects.forEach {project ->
- project.afterEvaluate {
- if (!pluginManager.hasPlugin("maven-publish")) {
- throw IllegalStateException(
- "Project ${project.path} is listed in publishedProjects, however it misses maven-publish plugin. " +
- "Please add maven-publish plugin (e.g. replace build-logic.jvm-library with build-logic.jvm-published-library) or " +
- "move the project to the list of notPublishedProjects"
- )
- }
- }
+ allprojects.mapTo(mutableSetOf()) { it.path } - notPublishedProjects
}
val displayVersion by extra {
@@ -116,7 +92,7 @@
}
releaseArtifacts {
- fromProject(projects.src.dist.dependencyProject.path)
+ fromProject(projects.src.dist.path)
previewSite {
into("rat")
from(tasks.rat) {
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 454bfaf..6925157 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -23,10 +23,10 @@
dependencies {
constraints {
- val publishedProjects: Set<Project> by rootProject.extra
- val platformProjects: Set<Project> by rootProject.extra
+ val publishedProjects: Set<String> by rootProject.extra
+ val platformProjects: Set<String> by rootProject.extra
(publishedProjects - platformProjects).forEach {
- api(it)
+ api(project(it))
}
}
}
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 8ac383a..40cf7b6 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -128,9 +128,9 @@
doLast {
val deps = configurations.runtimeClasspath.get().resolvedConfiguration.resolvedArtifacts
// This ensures project exists, if project is renamed, names should be corrected here as wells
- val launcherProject = projects.src.launcher.dependencyProject.path
- val bshclientProject = projects.src.bshclient.dependencyProject.path
- val jorphanProject = projects.src.jorphan.dependencyProject.path
+ val launcherProject = projects.src.launcher.path
+ val bshclientProject = projects.src.bshclient.path
+ val jorphanProject = projects.src.jorphan.path
listOf(libs, libsExt, binLibs).forEach {
it.filePermissions {
unix("rw-r--r--")