From 037074cef620a333372607d925f66d30048f2825 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 May 2021 21:37:34 +0600 Subject: [PATCH 1/7] start 0.8.2 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ee6834..74af321 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # SauceNaoAPI Changelog +## 0.8.2 + ## 0.8.1 * Versions updates: diff --git a/gradle.properties b/gradle.properties index d1dc0ef..fa21a9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ ktor_version=1.5.3 gradle_github_release_plugin_version=2.2.12 -library_version=0.8.1 +library_version=0.8.2 From 9f4feeccfca38e66ad92f296a240a03fe78cacc6 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 May 2021 21:39:42 +0600 Subject: [PATCH 2/7] update dependencies --- CHANGELOG.md | 7 +++++++ gradle.properties | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74af321..04c613a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## 0.8.2 +* Versions updates: + * `Kotlin`: `1.4.32` -> `1.5.10` + * `Klock`: `2.0.7` -> `2.1.0` + * `Ktor`: `1.5.3` -> `1.5.4` + * `Serialization`: `1.1.0` -> `1.2.1` + * `Coroutines`: `1.4.3` -> `1.5.0` + ## 0.8.1 * Versions updates: diff --git a/gradle.properties b/gradle.properties index fa21a9d..18cdcbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ kotlin.code.style=official -kotlin_version=1.4.32 -kotlin_coroutines_version=1.4.3 -kotlin_serialisation_version=1.1.0 -klock_version=2.0.7 -ktor_version=1.5.3 +kotlin_version=1.5.10 +kotlin_coroutines_version=1.5.0 +kotlin_serialisation_version=1.2.1 +klock_version=2.1.0 +ktor_version=1.5.4 gradle_github_release_plugin_version=2.2.12 From cbe76b3d95f899ae2f325bd10b50ae36b0d41dc3 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 May 2021 21:42:51 +0600 Subject: [PATCH 3/7] update gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2227aa2..67f0ab8 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip From 62ceae0066a21453b89bdf5f7ecdded1f0e4e349 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 May 2021 22:02:16 +0600 Subject: [PATCH 4/7] update klock --- CHANGELOG.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04c613a..94105b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Versions updates: * `Kotlin`: `1.4.32` -> `1.5.10` - * `Klock`: `2.0.7` -> `2.1.0` + * `Klock`: `2.0.7` -> `2.1.2` * `Ktor`: `1.5.3` -> `1.5.4` * `Serialization`: `1.1.0` -> `1.2.1` * `Coroutines`: `1.4.3` -> `1.5.0` diff --git a/gradle.properties b/gradle.properties index 18cdcbe..dd5a711 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official kotlin_version=1.5.10 kotlin_coroutines_version=1.5.0 kotlin_serialisation_version=1.2.1 -klock_version=2.1.0 +klock_version=2.1.2 ktor_version=1.5.4 gradle_github_release_plugin_version=2.2.12 From c800a81a4144791a7a867203496c6b4dc6c5f2c6 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 May 2021 22:10:53 +0600 Subject: [PATCH 5/7] update publish scripts --- publish.gradle | 10 ++++++++++ publish.kpsb | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/publish.gradle b/publish.gradle index 02eb876..fdced69 100644 --- a/publish.gradle +++ b/publish.gradle @@ -39,6 +39,16 @@ publishing { } } repositories { + if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) { + maven { + name = "GithubPackages" + url = uri("https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI") + credentials { + username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER') + password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD') + } + } + } if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { maven { name = "sonatype" diff --git a/publish.kpsb b/publish.kpsb index f8bd68b..d281e90 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/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/"}]}} +{"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":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}} \ No newline at end of file From 0ed1a8702b6a2b7d7a6d024543bab45bda75a82a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 May 2021 22:16:08 +0600 Subject: [PATCH 6/7] fix deprecations --- src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt | 4 ++-- .../kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt | 2 +- .../kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt index 4966c38..9c32c45 100644 --- a/src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt @@ -158,7 +158,7 @@ data class SauceNaoAPI( minSimilarity: Float? = null ): SauceNaoAnswer? { return suspendCoroutine { - requestsChannel.offer( + requestsChannel.trySend( it to HttpRequestBuilder().apply { url(searchUrl) @@ -212,4 +212,4 @@ data class SauceNaoAPI( timeManager.close() quotaManager.close() } -} \ No newline at end of file +} diff --git a/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt index 8144b2d..9a4b060 100644 --- a/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt @@ -92,7 +92,7 @@ internal class RequestQuotaManager ( quotaActions.send(callback) } } - quotaActions.offer(callback) + quotaActions.trySend(callback) } } diff --git a/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt index 0526c6f..538f88e 100644 --- a/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt +++ b/src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt @@ -84,7 +84,7 @@ internal class TimeManager( suspend fun getMostOldestInLongPeriod(): DateTime? { return suspendCoroutine { - actionsChannel.offer( + actionsChannel.trySend( TimeManagerMostOldestInLongGetter(it) ) } @@ -92,7 +92,7 @@ internal class TimeManager( suspend fun getMostOldestInShortPeriod(): DateTime? { return suspendCoroutine { - actionsChannel.offer(TimeManagerMostOldestInShortGetter(it)) + actionsChannel.trySend(TimeManagerMostOldestInShortGetter(it)) } } From 6ff3f76295610d93a41ac427612a90cfcc18a8c9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 May 2021 22:36:00 +0600 Subject: [PATCH 7/7] fixes of publish scripts --- .github/workflows/build_and_publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml index 21dd2a8..9a882da 100644 --- a/.github/workflows/build_and_publish.yml +++ b/.github/workflows/build_and_publish.yml @@ -17,7 +17,7 @@ jobs: - name: Build run: ./gradlew build - name: Publish - run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication -x signMetadataPublication + run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication env: GITHUBPACKAGES_USER: ${{ github.actor }} GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}