From f85693fb23ef2bdc4f26ce9f587c5378fc5da8fc Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 29 Jan 2020 22:15:21 +0600 Subject: [PATCH] v 0.2.0 --- gradle.properties | 8 +++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- postssystem.core/build.gradle | 2 +- postssystem.core/maven.publish.gradle | 2 +- postssystem.core/publish.gradle | 28 ++++++++++++++++++++++-- postssystem.exposed/build.gradle | 2 +- postssystem.exposed/gradle.properties | 4 ++-- postssystem.exposed/publish.gradle | 28 ++++++++++++++++++++++-- 8 files changed, 62 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index f4351845..a0a41861 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,9 @@ kotlin.code.style=official kotlin_version=1.3.61 -kotlin_coroutines_version=1.3.2 +kotlin_coroutines_version=1.3.3 kotlin_serialisation_runtime_version=0.14.0 -klockVersion=1.7.3 -uuidVersion=0.0.5 +klockVersion=1.8.7 +uuidVersion=0.0.7 gradle_bintray_plugin_version=1.8.4 - -disableImplicitReflectionSerializerAnnotation=-Xexperimental=kotlinx.serialization.ImplicitReflectionSerializer diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2ce3451..35f37208 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -#Wed Oct 16 13:07:45 OMST 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +#Wed JAN 29 22:07:00 OMST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/postssystem.core/build.gradle b/postssystem.core/build.gradle index 4d2526cc..c88caab3 100644 --- a/postssystem.core/build.gradle +++ b/postssystem.core/build.gradle @@ -17,7 +17,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" } -project.version = "0.1.1" +project.version = "0.2.0" project.group = "com.insanusmokrassar" apply from: "publish.gradle" diff --git a/postssystem.core/maven.publish.gradle b/postssystem.core/maven.publish.gradle index 6b644803..b81b338a 100644 --- a/postssystem.core/maven.publish.gradle +++ b/postssystem.core/maven.publish.gradle @@ -54,7 +54,7 @@ publishing { license { name "Apache Software License 2.0" - url "https://opensource.org/licenses/Apache-2.0" + url "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore/src/master/LICENSE" } } diff --git a/postssystem.core/publish.gradle b/postssystem.core/publish.gradle index 348c511d..b8cf4528 100644 --- a/postssystem.core/publish.gradle +++ b/postssystem.core/publish.gradle @@ -5,6 +5,26 @@ apply from: "maven.publish.gradle" bintray { user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') + filesSpec { + from "${buildDir}/publications/" + eachFile { + String directorySubname = it.getFile().parentFile.name + if (it.getName() == "module.json") { + if (directorySubname == "kotlinMultiplatform") { + it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module") + } else { + it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module") + } + } else { + if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") { + it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom") + } else { + it.exclude() + } + } + } + into "${project.group}".replace(".", "/") + } pkg { repo = "InsanusMokrassar" name = "${project.name}" @@ -24,8 +44,12 @@ bintray { bintrayUpload.doFirst { publications = publishing.publications.collect { - it.name - } + if (it.name.contains('kotlinMultiplatform')) { + null + } else { + it.name + } + } - null } bintrayUpload.dependsOn publishToMavenLocal \ No newline at end of file diff --git a/postssystem.exposed/build.gradle b/postssystem.exposed/build.gradle index 876ed5a3..e4207172 100644 --- a/postssystem.exposed/build.gradle +++ b/postssystem.exposed/build.gradle @@ -31,7 +31,7 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api "com.insanusmokrassar:postssystem.core:$core_version" - api "org.jetbrains.exposed:exposed:$exposed_version" + api "org.jetbrains.exposed:exposed-core:$exposed_version" testImplementation "org.xerial:sqlite-jdbc:$test_sqlite_version" testImplementation "org.junit.jupiter:junit-jupiter-api:$test_junit_version" diff --git a/postssystem.exposed/gradle.properties b/postssystem.exposed/gradle.properties index 6ea10c51..72a240fb 100644 --- a/postssystem.exposed/gradle.properties +++ b/postssystem.exposed/gradle.properties @@ -1,8 +1,8 @@ -exposed_version=0.17.7 +exposed_version=0.20.3 test_sqlite_version=3.28.0 test_junit_version=5.5.2 -core_version=0.1.1 +core_version=0.2.0 project_public_version=0.1.0 project_public_group=com.insanusmokrassar diff --git a/postssystem.exposed/publish.gradle b/postssystem.exposed/publish.gradle index 348c511d..b8cf4528 100644 --- a/postssystem.exposed/publish.gradle +++ b/postssystem.exposed/publish.gradle @@ -5,6 +5,26 @@ apply from: "maven.publish.gradle" bintray { user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') + filesSpec { + from "${buildDir}/publications/" + eachFile { + String directorySubname = it.getFile().parentFile.name + if (it.getName() == "module.json") { + if (directorySubname == "kotlinMultiplatform") { + it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.module") + } else { + it.setPath("${project.name}-${directorySubname}/${project.version}/${project.name}-${directorySubname}-${project.version}.module") + } + } else { + if (directorySubname == "kotlinMultiplatform" && it.getName() == "pom-default.xml") { + it.setPath("${project.name}/${project.version}/${project.name}-${project.version}.pom") + } else { + it.exclude() + } + } + } + into "${project.group}".replace(".", "/") + } pkg { repo = "InsanusMokrassar" name = "${project.name}" @@ -24,8 +44,12 @@ bintray { bintrayUpload.doFirst { publications = publishing.publications.collect { - it.name - } + if (it.name.contains('kotlinMultiplatform')) { + null + } else { + it.name + } + } - null } bintrayUpload.dependsOn publishToMavenLocal \ No newline at end of file