This commit is contained in:
InsanusMokrassar 2020-01-29 22:15:21 +06:00
parent 611be13e8f
commit f85693fb23
8 changed files with 62 additions and 16 deletions

View File

@ -1,11 +1,9 @@
kotlin.code.style=official kotlin.code.style=official
kotlin_version=1.3.61 kotlin_version=1.3.61
kotlin_coroutines_version=1.3.2 kotlin_coroutines_version=1.3.3
kotlin_serialisation_runtime_version=0.14.0 kotlin_serialisation_runtime_version=0.14.0
klockVersion=1.7.3 klockVersion=1.8.7
uuidVersion=0.0.5 uuidVersion=0.0.7
gradle_bintray_plugin_version=1.8.4 gradle_bintray_plugin_version=1.8.4
disableImplicitReflectionSerializerAnnotation=-Xexperimental=kotlinx.serialization.ImplicitReflectionSerializer

View File

@ -1,5 +1,5 @@
#Wed Oct 16 13:07:45 OMST 2019 #Wed JAN 29 22:07:00 OMST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -17,7 +17,7 @@ plugins {
id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
} }
project.version = "0.1.1" project.version = "0.2.0"
project.group = "com.insanusmokrassar" project.group = "com.insanusmokrassar"
apply from: "publish.gradle" apply from: "publish.gradle"

View File

@ -54,7 +54,7 @@ publishing {
license { license {
name "Apache Software License 2.0" name "Apache Software License 2.0"
url "https://opensource.org/licenses/Apache-2.0" url "https://git.insanusmokrassar.com/PostsSystem/PostsSystemCore/src/master/LICENSE"
} }
} }

View File

@ -5,6 +5,26 @@ apply from: "maven.publish.gradle"
bintray { bintray {
user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') 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') 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 { pkg {
repo = "InsanusMokrassar" repo = "InsanusMokrassar"
name = "${project.name}" name = "${project.name}"
@ -24,8 +44,12 @@ bintray {
bintrayUpload.doFirst { bintrayUpload.doFirst {
publications = publishing.publications.collect { publications = publishing.publications.collect {
if (it.name.contains('kotlinMultiplatform')) {
null
} else {
it.name it.name
} }
} - null
} }
bintrayUpload.dependsOn publishToMavenLocal bintrayUpload.dependsOn publishToMavenLocal

View File

@ -31,7 +31,7 @@ repositories {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
api "com.insanusmokrassar:postssystem.core:$core_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.xerial:sqlite-jdbc:$test_sqlite_version"
testImplementation "org.junit.jupiter:junit-jupiter-api:$test_junit_version" testImplementation "org.junit.jupiter:junit-jupiter-api:$test_junit_version"

View File

@ -1,8 +1,8 @@
exposed_version=0.17.7 exposed_version=0.20.3
test_sqlite_version=3.28.0 test_sqlite_version=3.28.0
test_junit_version=5.5.2 test_junit_version=5.5.2
core_version=0.1.1 core_version=0.2.0
project_public_version=0.1.0 project_public_version=0.1.0
project_public_group=com.insanusmokrassar project_public_group=com.insanusmokrassar

View File

@ -5,6 +5,26 @@ apply from: "maven.publish.gradle"
bintray { bintray {
user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') 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') 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 { pkg {
repo = "InsanusMokrassar" repo = "InsanusMokrassar"
name = "${project.name}" name = "${project.name}"
@ -24,8 +44,12 @@ bintray {
bintrayUpload.doFirst { bintrayUpload.doFirst {
publications = publishing.publications.collect { publications = publishing.publications.collect {
if (it.name.contains('kotlinMultiplatform')) {
null
} else {
it.name it.name
} }
} - null
} }
bintrayUpload.dependsOn publishToMavenLocal bintrayUpload.dependsOn publishToMavenLocal