fixes of publish scripts

0.8.0

.github/workflows/build_and_publish.yml

@@ -0,0 +1,23 @@
+name: Publish package to GitHub Packages
+on: [push]
+jobs:
+  publishing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Rewrite version
+        run: |
+          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
+          cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
+          rm gradle.properties
+          mv gradle.properties.tmp gradle.properties
+      - name: Build
+        run: ./gradlew build
+      - name: Publish
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
+        env:
+          GITHUBPACKAGES_USER: ${{ github.actor }}
+          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,30 @@
 # SauceNaoAPI Changelog
 
+## 0.8.2
+
+* Versions updates:
+  * `Kotlin`: `1.4.32` -> `1.5.10`
+  * `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`
+
+## 0.8.1
+
+* Versions updates:
+  * `Kotlin`: `1.4.31` -> `1.4.32`
+  * `Klock`: `2.0.6` -> `2.0.7`
+  * `Ktor`: `1.5.2` -> `1.5.3`
+
+## 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:

gradle.properties

@@ -1,10 +1,10 @@
 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.5.10
+kotlin_coroutines_version=1.5.0
+kotlin_serialisation_version=1.2.1
+klock_version=2.1.2
+ktor_version=1.5.4
 
 gradle_github_release_plugin_version=2.2.12
 
-library_version=0.7.2
+library_version=0.8.2

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.9-bin.zip

publication.kpsb

@@ -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"}]}}

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 {
@@ -48,22 +33,37 @@ 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"
                     }
                 
             }
         }
-        
         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('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"
+                    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')
+                    }
                 }
             }
         }
-        
     }
-}
+}
+
+signing {
+    useGpgCmd()
+    sign publishing.publications
+}

publish.kpsb

@@ -0,0 +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":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}]}}

src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt

@@ -158,7 +158,7 @@ data class SauceNaoAPI(
         minSimilarity: Float? = null
     ): SauceNaoAnswer? {
         return suspendCoroutine<SauceNaoAnswer> {
-            requestsChannel.offer(
+            requestsChannel.trySend(
                 it to HttpRequestBuilder().apply {
                     url(searchUrl)
 
@@ -212,4 +212,4 @@ data class SauceNaoAPI(
         timeManager.close()
         quotaManager.close()
     }
-}
+}

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)
         }
     }
 

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))
         }
     }