From d82bff2563b3ba90ec99825e1c3090bdaca3902c Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 8 Mar 2021 00:32:50 +0600 Subject: [PATCH 1/4] start 0.8.0 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03cb623..f4b91eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # SauceNaoAPI Changelog +## 0.8.0 + ## 0.7.2 * Versions updates: diff --git a/gradle.properties b/gradle.properties index c730076..af9678c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ ktor_version=1.5.1 gradle_github_release_plugin_version=2.2.12 -library_version=0.7.2 +library_version=0.8.0 From 503c4226d7ad84c78b81eda18ba420b5c40b24fe Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 8 Mar 2021 00:35:39 +0600 Subject: [PATCH 2/4] update dependencies --- CHANGELOG.md | 7 +++++++ gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4b91eb..8f87151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## 0.8.0 +* Versions updates: + * `Kotlin`: `1.4.21` -> `1.4.31` + * `Klock`: `2.0.4` -> `2.0.6` + * `Ktor`: `1.5.1` -> `1.5.2` + * `Kotlin Serialisation`: `1.0.1` -> `1.1.0` + * `Kotlin Coroutines`: `1.4.2` -> `1.4.3` + ## 0.7.2 * Versions updates: diff --git a/gradle.properties b/gradle.properties index af9678c..9828a9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ kotlin.code.style=official -kotlin_version=1.4.21 -kotlin_coroutines_version=1.4.2 -kotlin_serialisation_version=1.0.1 -klock_version=2.0.4 -ktor_version=1.5.1 +kotlin_version=1.4.31 +kotlin_coroutines_version=1.4.3 +kotlin_serialisation_version=1.1.0 +klock_version=2.0.6 +ktor_version=1.5.2 gradle_github_release_plugin_version=2.2.12 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index de13cc8..2227aa2 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-6.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip From 6aabcca9d2d5f291918673a2478fb227db6e4e00 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 8 Mar 2021 00:37:31 +0600 Subject: [PATCH 3/4] update publish scripts --- publication.kpsb | 1 - publish.gradle | 40 +++++++++++++++------------------------- publish.kpsb | 1 + 3 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 publication.kpsb create mode 100644 publish.kpsb diff --git a/publication.kpsb b/publication.kpsb deleted file mode 100644 index cc2a057..0000000 --- a/publication.kpsb +++ /dev/null @@ -1 +0,0 @@ -{"bintrayConfig":{"repo":"SauceNaoAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/${project.name}","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"SauceNao API","description":"SauceNao API library","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/insanusmokrassar/${project.name}.git","developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}]}} \ No newline at end of file diff --git a/publish.gradle b/publish.gradle index 8390074..e2f218e 100644 --- a/publish.gradle +++ b/publish.gradle @@ -1,24 +1,9 @@ apply plugin: 'maven-publish' +apply plugin: 'signing' task javadocsJar(type: Jar) { classifier = 'javadoc' } -task sourceJar (type : Jar) { - classifier = 'sources' -} - -afterEvaluate { - project.publishing.publications.all { - // rename artifacts - groupId "${project.group}" - if (it.name.contains('kotlinMultiplatform')) { - artifactId = "${project.name}" - artifact sourceJar - } else { - artifactId = "${project.name}-$name" - } - } -} publishing { publications.all { @@ -53,17 +38,22 @@ publishing { } } - repositories { - maven { - name = "bintray" - url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/SauceNaoAPI/${project.name}/;publish=1;override=1") - credentials { - username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') - password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') + if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { + maven { + name = "sonatype" + url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') + password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') + } } } } - } -} \ No newline at end of file +} + +signing { + useGpgCmd() + sign publishing.publications +} diff --git a/publish.kpsb b/publish.kpsb new file mode 100644 index 0000000..47efee5 --- /dev/null +++ b/publish.kpsb @@ -0,0 +1 @@ +{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"SauceNao API","description":"SauceNao API library","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/insanusmokrassar/${project.name}.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}} \ No newline at end of file From cba4b2ccdb12cd32724bc8432c6aa98e51668686 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 8 Mar 2021 00:38:32 +0600 Subject: [PATCH 4/4] update publish scripts --- publish.gradle | 2 +- publish.kpsb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/publish.gradle b/publish.gradle index e2f218e..02eb876 100644 --- a/publish.gradle +++ b/publish.gradle @@ -33,7 +33,7 @@ publishing { license { name = "Apache Software License 2.0" - url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE" + url = "https://github.com/InsanusMokrassar/SauceNaoAPI/blob/master/LICENSE" } } diff --git a/publish.kpsb b/publish.kpsb index 47efee5..f8bd68b 100644 --- a/publish.kpsb +++ b/publish.kpsb @@ -1 +1 @@ -{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"SauceNao API","description":"SauceNao API library","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/insanusmokrassar/${project.name}.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}} \ No newline at end of file +{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/SauceNaoAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"SauceNao API","description":"SauceNao API library","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/insanusmokrassar/${project.name}.git","includeGpgSigning":true,"developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}