diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29..4eed8f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +# 0.2.0 + +* Updated way of publishing (for more info look at the [git](https://git.insanusmokrassar.com/InsanusMokrassar/krontab)) +* Updates in libraries: + * Coroutines `1.3.2` -> `1.3.3` + * Klock `1.7.3` -> `1.8.6` diff --git a/build.gradle b/build.gradle index 8211aa6..0aa107a 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version" } -project.version = "$project_public_version" -project.group = "$project_public_group" +project.version = "0.2.0" +project.group = "com.insanusmokrassar" apply from: "publish.gradle" diff --git a/gradle.properties b/gradle.properties index a02d086..e3c4d7e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,9 @@ kotlin.code.style=official kotlin_version=1.3.61 -kotlin_coroutines_version=1.3.2 +kotlin_coroutines_version=1.3.3 gradle_bintray_plugin_version=1.8.4 -klockVersion=1.7.3 - -project_bintray_repo=InsanusMokrassar -project_public_version=0.1.1 -project_public_group=com.insanusmokrassar -project_public_name=Krontab -project_public_description=It is analog of crontab util for Kotlin Coroutines -project_url=https://git.insanusmokrassar.com/InsanusMokrassar/krontab -project_vcs=https://git.insanusmokrassar.com/InsanusMokrassar/krontab.git +klockVersion=1.8.6 kotlin.incremental.multiplatform=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5c82840..d66d2a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip diff --git a/maven.publish.gradle b/maven.publish.gradle index d6c4a5e..7332ba5 100644 --- a/maven.publish.gradle +++ b/maven.publish.gradle @@ -1,5 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'signing' task javadocsJar(type: Jar) { classifier = 'javadoc' @@ -25,41 +24,34 @@ publishing { asNode().children().last() + { resolveStrategy = Closure.DELEGATE_FIRST - description "${project_public_description}" - name "${project_public_name}" - url "${project_url}" + description "It is an analog of crontab util for Kotlin Coroutines" + name "Krontab" + url "https://git.insanusmokrassar.com/InsanusMokrassar/krontab" scm { - developerConnection "scm:git:[fetch=]${project_vcs}[push=]${project_vcs}" - url "${project_vcs}" + developerConnection "scm:git:[fetch=]https://git.insanusmokrassar.com/InsanusMokrassar/krontab.git[push=]https://git.insanusmokrassar.com/InsanusMokrassar/krontab.git" + url "https://git.insanusmokrassar.com/InsanusMokrassar/krontab.git" } developers { - developer { - id "InsanusMokrassar" - name "Ovsyannikov Alexey" - email "ovsyannikov.alexey95@gmail.com" - } - developer { - id "mi-ast" - name "Michail Astafiev" - email "astaf65@gmail.com" - } + + developer { + id "InsanusMokrassar" + name "Ovsiannikov Aleksei" + email "ovsyannikov.alexey95@gmail.com" + } + } licenses { - license { - name "The Apache Software License, Version 2.0" - url "${project_url}/src/master/LICENSE" - distribution "repo" - } + + license { + name "Apache Software License 2.0" + url "https://git.insanusmokrassar.com/InsanusMokrassar/krontab/src/master/LICENSE" + } + } } } } -} - -signing { - useGpgCmd() - sign(publishing.publications) -} +} \ No newline at end of file diff --git a/mpp_config.json b/mpp_config.json new file mode 100644 index 0000000..2552577 --- /dev/null +++ b/mpp_config.json @@ -0,0 +1 @@ +{"bintrayConfig":{"repo":"InsanusMokrassar","packageName":"${project.name}","packageVcs":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab"},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab/src/master/LICENSE"}],"mavenConfig":{"name":"Krontab","description":"It is an analog of crontab util for Kotlin Coroutines","url":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab","vcsUrl":"https://git.insanusmokrassar.com/InsanusMokrassar/krontab.git","developers":[{"id":"InsanusMokrassar","name":"Ovsiannikov Aleksei","eMail":"ovsyannikov.alexey95@gmail.com"}]}} \ No newline at end of file diff --git a/publish.gradle b/publish.gradle index 899607e..24f0da8 100644 --- a/publish.gradle +++ b/publish.gradle @@ -6,14 +6,18 @@ 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') pkg { - repo = "$project_bintray_repo" + repo = "InsanusMokrassar" name = "${project.name}" - vcsUrl = "${project_url}" - licenses = ['Apache-2.0'] + vcsUrl = "https://git.insanusmokrassar.com/InsanusMokrassar/krontab" + licenses = ["Apache-2.0"] version { name = "${project.version}" released = new Date() vcsTag = "${project.version}" + gpg { + sign = true + passphrase = project.hasProperty('signing.gnupg.passphrase') ? project.property('signing.gnupg.passphrase') : System.getenv('signing.gnupg.passphrase') + } } } } @@ -24,4 +28,4 @@ bintrayUpload.doFirst { } } -bintrayUpload.dependsOn publishToMavenLocal +bintrayUpload.dependsOn publishToMavenLocal \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index bd02020..cfd729c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,20 +1 @@ -/* - * This settings file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * In a single project build this file can be empty or even removed. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user guide at https://docs.gradle.org/4.4.1/userguide/multi_project_builds.html - */ - -/* -// To declare projects as part of a multi-project build use the 'include' method -include 'shared' -include 'api' -include 'services:webservice' -*/ - rootProject.name = 'krontab' - -enableFeaturePreview('GRADLE_METADATA')