From f3f670abd7e9a0bccf81c05eaa951cb4f084c448 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 10 Aug 2020 17:27:16 +0600 Subject: [PATCH] temporal fix of tasks cyclic error --- build.gradle | 4 +++ core/api/build.gradle | 4 +-- core/exposed/build.gradle | 4 +-- core/ktor/client/build.gradle | 4 +-- core/ktor/common/build.gradle | 4 +-- exposed/commons/build.gradle | 2 +- ktor/client/build.gradle | 2 +- markups/build.gradle | 2 +- publishing/api/build.gradle | 2 +- publishing/exposed/build.gradle | 4 +-- settings.gradle | 43 ++++++++++++++++++++++---------- utils/repos/exposed/build.gradle | 4 +-- 12 files changed, 50 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 9ea517c1..c58bcd30 100644 --- a/build.gradle +++ b/build.gradle @@ -12,3 +12,7 @@ repositories { mavenCentral() maven { url "https://kotlin.bintray.com/kotlinx" } } + +subprojects.each { + println(it) +} diff --git a/core/api/build.gradle b/core/api/build.gradle index 4dc55162..c04ca886 100644 --- a/core/api/build.gradle +++ b/core/api/build.gradle @@ -29,7 +29,7 @@ repositories { maven { url "https://kotlin.bintray.com/kotlinx" } } -project.kotlin { +kotlin { jvm() js() @@ -41,7 +41,7 @@ project.kotlin { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { api "com.insanusmokrassar:postssystem.utils.repos:$core_version" } else { - api project(":utils:repos:common") + api project(":utils:repos:utils.repos.common") } } } diff --git a/core/exposed/build.gradle b/core/exposed/build.gradle index c3e01416..458ac204 100644 --- a/core/exposed/build.gradle +++ b/core/exposed/build.gradle @@ -37,8 +37,8 @@ dependencies { api "com.insanusmokrassar:postssystem.core.api:$core_version" api "com.insanusmokrassar:postssystem.exposed.commons:$core_version" } else { - api project(":core:api") - api project(":exposed:commons") + api project(":core:core.api") + api project(":exposed:exposed.commons") } testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" diff --git a/core/ktor/client/build.gradle b/core/ktor/client/build.gradle index 373cfb75..80b9f288 100644 --- a/core/ktor/client/build.gradle +++ b/core/ktor/client/build.gradle @@ -42,8 +42,8 @@ kotlin { api "com.insanusmokrassar:postssystem.core.ktor.common:$core_version" api "com.insanusmokrassar:postssystem.ktor.client:$core_version" } else { - api project(":core:ktor:common") - api project(":ktor:client") + api project(":core:ktor:core.ktor.common") + api project(":ktor:ktor.client") } } } diff --git a/core/ktor/common/build.gradle b/core/ktor/common/build.gradle index d74a4900..f288b8f3 100644 --- a/core/ktor/common/build.gradle +++ b/core/ktor/common/build.gradle @@ -42,8 +42,8 @@ kotlin { api "com.insanusmokrassar:postssystem.ktor.common:$core_version" api "com.insanusmokrassar:postssystem.core.api:$core_version" } else { - api project(":ktor:common") - api project(":core:api") + api project(":ktor:ktor.common") + api project(":core:core.api") } } } diff --git a/exposed/commons/build.gradle b/exposed/commons/build.gradle index 92678dc0..8304a190 100644 --- a/exposed/commons/build.gradle +++ b/exposed/commons/build.gradle @@ -37,7 +37,7 @@ dependencies { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { api "com.insanusmokrassar:postssystem.utils.repos:$core_version" } else { - api project(":utils:repos:common") + api project(":utils:repos:utils.repos.common") } testImplementation "org.jetbrains.kotlin:kotlin-test" diff --git a/ktor/client/build.gradle b/ktor/client/build.gradle index d7b7f187..c7040c20 100644 --- a/ktor/client/build.gradle +++ b/ktor/client/build.gradle @@ -41,7 +41,7 @@ kotlin { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { api "com.insanusmokrassar:postssystem.ktor.common:$core_version" } else { - api project(":ktor:common") + api project(":ktor:ktor.common") } api "io.ktor:ktor-client-core:$ktor_version" diff --git a/markups/build.gradle b/markups/build.gradle index a2e60835..1613fc76 100644 --- a/markups/build.gradle +++ b/markups/build.gradle @@ -43,7 +43,7 @@ kotlin { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { api "com.insanusmokrassar:postssystem.core.api:$core_version" } else { - api project(":core:api") + api project(":core:core.api") } api "com.soywiz.korlibs.klock:klock:$klockVersion" diff --git a/publishing/api/build.gradle b/publishing/api/build.gradle index 6e9a5d17..278a7908 100644 --- a/publishing/api/build.gradle +++ b/publishing/api/build.gradle @@ -41,7 +41,7 @@ kotlin { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { api "com.insanusmokrassar:postssystem.core.api:$core_version" } else { - api project(":core:api") + api project(":core:core.api") } } } diff --git a/publishing/exposed/build.gradle b/publishing/exposed/build.gradle index 1640c450..f42ea51e 100644 --- a/publishing/exposed/build.gradle +++ b/publishing/exposed/build.gradle @@ -37,8 +37,8 @@ dependencies { api "com.insanusmokrassar:postssystem.core.publishing:$core_version" api "com.insanusmokrassar:postssystem.exposed.commons:$core_version" } else { - api project(":publishing:api") - api project(":exposed:commons") + api project(":publishing:publishing.api") + api project(":exposed:exposed.commons") } testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" diff --git a/settings.gradle b/settings.gradle index 82cf7393..627556e3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,20 +1,37 @@ rootProject.name='postssystem' -include ':utils:repos:common' -include ':utils:repos:exposed' +String[] includes = [ + ':utils', + ':utils:repos', + ':utils:repos:common', + ':utils:repos:exposed', -include ':exposed:commons' + ':exposed', + ':exposed:commons', -include ':ktor:common' -include ':ktor:client' + ':ktor', + ':ktor:common', + ':ktor:client', -include ':core:api' -include ':core:exposed' -include ':core:ktor:common' -include ':core:ktor:client' + ':core', + ':core:api', + ':core:exposed', + ':core:ktor', + ':core:ktor:common', + ':core:ktor:client', -include ':publishing:api' -include ':publishing:exposed' + ':publishing', + ':publishing:api', + ':publishing:exposed', -include ':markups' -include ':markups:html' + ':markups', + ':markups:html' +] + + +includes.each { + include it + ProjectDescriptor project = project(it) + println(project.projectDir.absolutePath.replace(rootDir.absolutePath, "")) + project.name = project.projectDir.absolutePath.replace(rootDir.absolutePath, "").replace("/", ".").replaceFirst("\\.", "") +} diff --git a/utils/repos/exposed/build.gradle b/utils/repos/exposed/build.gradle index ce43cebf..bd0b7866 100644 --- a/utils/repos/exposed/build.gradle +++ b/utils/repos/exposed/build.gradle @@ -37,8 +37,8 @@ dependencies { api "com.insanusmokrassar:postssystem.utils.repos:$core_version" api "com.insanusmokrassar:postssystem.exposed.commons:$core_version" } else { - api project(":utils:repos:common") - api project(":exposed:commons") + api project(":utils:repos:utils.repos.common") + api project(":exposed:exposed.commons") } testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"