я победюн

This commit is contained in:
InsanusMokrassar 2020-08-10 18:10:03 +06:00
parent f3f670abd7
commit 8bd6ef3d5f
13 changed files with 20 additions and 18 deletions

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.utils.repos:$core_version" api "com.insanusmokrassar:postssystem.utils.repos:$core_version"
} else { } else {
api project(":utils:repos:utils.repos.common") api project(":utils:repos:postssystem.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:core.api") api project(":core:postssystem.core.api")
api project(":exposed:exposed.commons") api project(":exposed:postssystem.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:core.ktor.common") api project(":core:ktor:postssystem.core.ktor.common")
api project(":ktor:ktor.client") api project(":ktor:postssystem.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:ktor.common") api project(":ktor:postssystem.ktor.common")
api project(":core:core.api") api project(":core:postssystem.core.api")
} }
} }
} }

View File

@ -33,11 +33,12 @@ repositories {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
api "org.jetbrains.exposed:exposed-core:$exposed_version" api "org.jetbrains.exposed:exposed-core:$exposed_version"
api "org.jetbrains.exposed:exposed-jdbc:$exposed_version"
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:utils.repos.common") api project(":utils:repos:postssystem.utils.repos.common")
} }
testImplementation "org.jetbrains.kotlin:kotlin-test" testImplementation "org.jetbrains.kotlin:kotlin-test"

View File

@ -1,2 +0,0 @@
exposed_version=0.26.1
test_sqlite_version=3.28.0

View File

@ -8,6 +8,9 @@ ktor_version=1.3.2
klockVersion=1.11.12 klockVersion=1.11.12
uuidVersion=0.1.0 uuidVersion=0.1.0
exposed_version=0.26.2
test_sqlite_version=3.32.3.2
gradle_bintray_plugin_version=1.8.4 gradle_bintray_plugin_version=1.8.4
core_version=0.4.2 core_version=0.4.2

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:ktor.common") api project(":ktor:postssystem.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:core.api") api project(":core:postssystem.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:core.api") api project(":core:postssystem.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:publishing.api") api project(":publishing:postssystem.publishing.api")
api project(":exposed:exposed.commons") api project(":exposed:postssystem.exposed.commons")
} }
testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"

View File

@ -33,5 +33,5 @@ includes.each {
include it include it
ProjectDescriptor project = project(it) ProjectDescriptor project = project(it)
println(project.projectDir.absolutePath.replace(rootDir.absolutePath, "")) println(project.projectDir.absolutePath.replace(rootDir.absolutePath, ""))
project.name = project.projectDir.absolutePath.replace(rootDir.absolutePath, "").replace("/", ".").replaceFirst("\\.", "") project.name = rootProject.name + project.projectDir.absolutePath.replace(rootDir.absolutePath, "").replace("/", ".")
} }

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:utils.repos.common") api project(":utils:repos:postssystem.utils.repos.common")
api project(":exposed:exposed.commons") api project(":exposed:postssystem.exposed.commons")
} }
testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"