temporal fix of tasks cyclic error

This commit is contained in:
InsanusMokrassar 2020-08-10 17:27:16 +06:00
parent 5e15435c11
commit f3f670abd7
12 changed files with 50 additions and 29 deletions

View File

@ -12,3 +12,7 @@ repositories {
mavenCentral() mavenCentral()
maven { url "https://kotlin.bintray.com/kotlinx" } maven { url "https://kotlin.bintray.com/kotlinx" }
} }
subprojects.each {
println(it)
}

View File

@ -29,7 +29,7 @@ repositories {
maven { url "https://kotlin.bintray.com/kotlinx" } maven { url "https://kotlin.bintray.com/kotlinx" }
} }
project.kotlin { kotlin {
jvm() jvm()
js() js()
@ -41,7 +41,7 @@ project.kotlin {
if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
api "com.insanusmokrassar:postssystem.utils.repos:$core_version" api "com.insanusmokrassar:postssystem.utils.repos:$core_version"
} else { } else {
api project(":utils:repos:common") api project(":utils:repos:utils.repos.common")
} }
} }
} }

View File

@ -37,8 +37,8 @@ dependencies {
api "com.insanusmokrassar:postssystem.core.api:$core_version" api "com.insanusmokrassar:postssystem.core.api:$core_version"
api "com.insanusmokrassar:postssystem.exposed.commons:$core_version" api "com.insanusmokrassar:postssystem.exposed.commons:$core_version"
} else { } else {
api project(":core:api") api project(":core:core.api")
api project(":exposed:commons") api project(":exposed:exposed.commons")
} }
testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"

View File

@ -42,8 +42,8 @@ kotlin {
api "com.insanusmokrassar:postssystem.core.ktor.common:$core_version" api "com.insanusmokrassar:postssystem.core.ktor.common:$core_version"
api "com.insanusmokrassar:postssystem.ktor.client:$core_version" api "com.insanusmokrassar:postssystem.ktor.client:$core_version"
} else { } else {
api project(":core:ktor:common") api project(":core:ktor:core.ktor.common")
api project(":ktor:client") api project(":ktor:ktor.client")
} }
} }
} }

View File

@ -42,8 +42,8 @@ kotlin {
api "com.insanusmokrassar:postssystem.ktor.common:$core_version" api "com.insanusmokrassar:postssystem.ktor.common:$core_version"
api "com.insanusmokrassar:postssystem.core.api:$core_version" api "com.insanusmokrassar:postssystem.core.api:$core_version"
} else { } else {
api project(":ktor:common") api project(":ktor:ktor.common")
api project(":core:api") api project(":core:core.api")
} }
} }
} }

View File

@ -37,7 +37,7 @@ dependencies {
if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
api "com.insanusmokrassar:postssystem.utils.repos:$core_version" api "com.insanusmokrassar:postssystem.utils.repos:$core_version"
} else { } else {
api project(":utils:repos:common") api project(":utils:repos:utils.repos.common")
} }
testImplementation "org.jetbrains.kotlin:kotlin-test" testImplementation "org.jetbrains.kotlin:kotlin-test"

View File

@ -41,7 +41,7 @@ kotlin {
if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
api "com.insanusmokrassar:postssystem.ktor.common:$core_version" api "com.insanusmokrassar:postssystem.ktor.common:$core_version"
} else { } else {
api project(":ktor:common") api project(":ktor:ktor.common")
} }
api "io.ktor:ktor-client-core:$ktor_version" api "io.ktor:ktor-client-core:$ktor_version"

View File

@ -43,7 +43,7 @@ kotlin {
if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
api "com.insanusmokrassar:postssystem.core.api:$core_version" api "com.insanusmokrassar:postssystem.core.api:$core_version"
} else { } else {
api project(":core:api") api project(":core:core.api")
} }
api "com.soywiz.korlibs.klock:klock:$klockVersion" api "com.soywiz.korlibs.klock:klock:$klockVersion"

View File

@ -41,7 +41,7 @@ kotlin {
if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") {
api "com.insanusmokrassar:postssystem.core.api:$core_version" api "com.insanusmokrassar:postssystem.core.api:$core_version"
} else { } else {
api project(":core:api") api project(":core:core.api")
} }
} }
} }

View File

@ -37,8 +37,8 @@ dependencies {
api "com.insanusmokrassar:postssystem.core.publishing:$core_version" api "com.insanusmokrassar:postssystem.core.publishing:$core_version"
api "com.insanusmokrassar:postssystem.exposed.commons:$core_version" api "com.insanusmokrassar:postssystem.exposed.commons:$core_version"
} else { } else {
api project(":publishing:api") api project(":publishing:publishing.api")
api project(":exposed:commons") api project(":exposed:exposed.commons")
} }
testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"

View File

@ -1,20 +1,37 @@
rootProject.name='postssystem' rootProject.name='postssystem'
include ':utils:repos:common' String[] includes = [
include ':utils:repos:exposed' ':utils',
':utils:repos',
':utils:repos:common',
':utils:repos:exposed',
include ':exposed:commons' ':exposed',
':exposed:commons',
include ':ktor:common' ':ktor',
include ':ktor:client' ':ktor:common',
':ktor:client',
include ':core:api' ':core',
include ':core:exposed' ':core:api',
include ':core:ktor:common' ':core:exposed',
include ':core:ktor:client' ':core:ktor',
':core:ktor:common',
':core:ktor:client',
include ':publishing:api' ':publishing',
include ':publishing:exposed' ':publishing:api',
':publishing:exposed',
include ':markups' ':markups',
include ':markups:html' ':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("\\.", "")
}

View File

@ -37,8 +37,8 @@ dependencies {
api "com.insanusmokrassar:postssystem.utils.repos:$core_version" api "com.insanusmokrassar:postssystem.utils.repos:$core_version"
api "com.insanusmokrassar:postssystem.exposed.commons:$core_version" api "com.insanusmokrassar:postssystem.exposed.commons:$core_version"
} else { } else {
api project(":utils:repos:common") api project(":utils:repos:utils.repos.common")
api project(":exposed:commons") api project(":exposed:exposed.commons")
} }
testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"