From 8bd6ef3d5fa72327f267da3026d986dfddfee25f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 10 Aug 2020 18:10:03 +0600 Subject: [PATCH] =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=B1=D0=B5=D0=B4=D1=8E?= =?UTF-8?q?=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/api/build.gradle | 2 +- core/exposed/build.gradle | 4 ++-- core/ktor/client/build.gradle | 4 ++-- core/ktor/common/build.gradle | 4 ++-- exposed/commons/build.gradle | 3 ++- exposed/commons/gradle.properties | 2 -- gradle.properties | 3 +++ ktor/client/build.gradle | 2 +- markups/build.gradle | 2 +- publishing/api/build.gradle | 2 +- publishing/exposed/build.gradle | 4 ++-- settings.gradle | 2 +- utils/repos/exposed/build.gradle | 4 ++-- 13 files changed, 20 insertions(+), 18 deletions(-) diff --git a/core/api/build.gradle b/core/api/build.gradle index c04ca886..b58b90b1 100644 --- a/core/api/build.gradle +++ b/core/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.utils.repos:$core_version" } else { - api project(":utils:repos:utils.repos.common") + api project(":utils:repos:postssystem.utils.repos.common") } } } diff --git a/core/exposed/build.gradle b/core/exposed/build.gradle index 458ac204..2343c1ef 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:core.api") - api project(":exposed:exposed.commons") + api project(":core:postssystem.core.api") + api project(":exposed:postssystem.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 80b9f288..e766987d 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:core.ktor.common") - api project(":ktor:ktor.client") + api project(":core:ktor:postssystem.core.ktor.common") + api project(":ktor:postssystem.ktor.client") } } } diff --git a/core/ktor/common/build.gradle b/core/ktor/common/build.gradle index f288b8f3..6fb480de 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:ktor.common") - api project(":core:core.api") + api project(":ktor:postssystem.ktor.common") + api project(":core:postssystem.core.api") } } } diff --git a/exposed/commons/build.gradle b/exposed/commons/build.gradle index 8304a190..2c240ae8 100644 --- a/exposed/commons/build.gradle +++ b/exposed/commons/build.gradle @@ -33,11 +33,12 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_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") { api "com.insanusmokrassar:postssystem.utils.repos:$core_version" } else { - api project(":utils:repos:utils.repos.common") + api project(":utils:repos:postssystem.utils.repos.common") } testImplementation "org.jetbrains.kotlin:kotlin-test" diff --git a/exposed/commons/gradle.properties b/exposed/commons/gradle.properties index 51e36b3d..e69de29b 100644 --- a/exposed/commons/gradle.properties +++ b/exposed/commons/gradle.properties @@ -1,2 +0,0 @@ -exposed_version=0.26.1 -test_sqlite_version=3.28.0 diff --git a/gradle.properties b/gradle.properties index b4b0a7b9..5f2e131e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,9 @@ ktor_version=1.3.2 klockVersion=1.11.12 uuidVersion=0.1.0 +exposed_version=0.26.2 +test_sqlite_version=3.32.3.2 + gradle_bintray_plugin_version=1.8.4 core_version=0.4.2 diff --git a/ktor/client/build.gradle b/ktor/client/build.gradle index c7040c20..3766bb38 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:ktor.common") + api project(":ktor:postssystem.ktor.common") } api "io.ktor:ktor-client-core:$ktor_version" diff --git a/markups/build.gradle b/markups/build.gradle index 1613fc76..87783e84 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:core.api") + api project(":core:postssystem.core.api") } api "com.soywiz.korlibs.klock:klock:$klockVersion" diff --git a/publishing/api/build.gradle b/publishing/api/build.gradle index 278a7908..7d3ed840 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:core.api") + api project(":core:postssystem.core.api") } } } diff --git a/publishing/exposed/build.gradle b/publishing/exposed/build.gradle index f42ea51e..b198520d 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:publishing.api") - api project(":exposed:exposed.commons") + api project(":publishing:postssystem.publishing.api") + api project(":exposed:postssystem.exposed.commons") } testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" diff --git a/settings.gradle b/settings.gradle index 627556e3..1ae869cc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -33,5 +33,5 @@ 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("\\.", "") + project.name = rootProject.name + project.projectDir.absolutePath.replace(rootDir.absolutePath, "").replace("/", ".") } diff --git a/utils/repos/exposed/build.gradle b/utils/repos/exposed/build.gradle index bd0b7866..43cf9ca1 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:utils.repos.common") - api project(":exposed:exposed.commons") + api project(":utils:repos:postssystem.utils.repos.common") + api project(":exposed:postssystem.exposed.commons") } testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version"