migration onto toml and actualizing of publish scripts

0.9.1

.github/workflows/build_and_publish.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Rewrite version
         run: |
           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
@@ -18,6 +18,7 @@ jobs:
         run: ./gradlew build
       - name: Publish
         run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
+        continue-on-error: true
         env:
           GITHUBPACKAGES_USER: ${{ github.actor }}
           GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,22 @@
 # SauceNaoAPI Changelog
 
+## 0.9.1
+
+* Versions updates:
+  * `Kotlin`: `1.5.30` -> `1.5.31`
+  * `Klock`: `2.4.0` -> `2.4.2`
+  * `Coroutines`: `1.5.1` -> `1.5.2`
+* Add several extensions to `ResultData`: `authors`, `froms`, `charactersList`, `titles`, `urls`
+
+## 0.9.0
+
+* Versions updates:
+  * `Kotlin`: `1.5.10` -> `1.5.30`
+  * `Klock`: `2.1.2` -> `2.4.0`
+  * `Ktor`: `1.5.4` -> `1.6.3`
+  * `Serialization`: `1.2.1` -> `1.2.2`
+  * `Coroutines`: `1.5.0` -> `1.5.1`
+
 ## 0.8.2
 
 * Versions updates:

README.md

@@ -1,6 +1,7 @@
 # SauceNaoAPI
 
- [ ![Download](https://api.bintray.com/packages/insanusmokrassar/SauceNaoAPI/saucenaoapi/images/download.svg) ](https://bintray.com/insanusmokrassar/SauceNaoAPI/saucenaoapi/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/saucenaoapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/saucenaoapi)
+
 
 It is wrapper for [SauceNAO](https://saucenao.com/) API. For now, library is
 in preview state. It can be fully used, but some of info can be unavailable from

build.gradle

@@ -1,20 +1,19 @@
 buildscript {
     repositories {
         mavenLocal()
-        jcenter()
         mavenCentral()
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.github.breadmoirai:github-release:$gradle_github_release_plugin_version"
+        classpath libs.buildscript.kt.gradle
+        classpath libs.buildscript.kt.serialization
+        classpath libs.buildscript.gh.release
     }
 }
 
 plugins {
-    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+    alias(libs.plugins.multiplatform)
+    alias(libs.plugins.serialization)
 }
 
 project.version = "$library_version"
@@ -25,14 +24,12 @@ apply from: "github_release.gradle"
 
 repositories {
     mavenLocal()
-    jcenter()
     mavenCentral()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
 }
 
 kotlin {
     jvm()
-    js(BOTH) {
+    js(IR) {
         browser()
         nodejs()
     }
@@ -43,10 +40,10 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_version"
-                api "com.soywiz.korlibs.klock:klock:$klock_version"
-                api "io.ktor:ktor-client-core:$ktor_version"
+                api libs.kt.coroutines
+                api libs.kt.serialization
+                api libs.klock
+                api libs.ktor.client
             }
         }
         commonTest {
@@ -58,7 +55,7 @@ kotlin {
         jvmTest {
             dependencies {
                 implementation kotlin('test-junit')
-                implementation "io.ktor:ktor-client-okhttp:$ktor_version"
+                implementation libs.ktor.client.okhttp
             }
         }
         jsTest {

gradle.properties

@@ -1,10 +1,3 @@
 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.2
-ktor_version=1.5.4
 
-gradle_github_release_plugin_version=2.2.12
-
-library_version=0.8.2
+library_version=0.10.0

gradle/libs.versions.toml

@@ -0,0 +1,30 @@
+[versions]
+
+kt = "1.6.10"
+kt-serialization = "1.3.2"
+kt-coroutines = "1.6.0"
+
+klock = "2.6.2"
+ktor = "1.6.7"
+
+gh-release = "2.2.12"
+
+[libraries]
+
+kt-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kt" }
+kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kt-serialization" }
+kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" }
+
+klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }
+
+ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+
+buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" }
+buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
+buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
+
+[plugins]
+
+multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kt" }
+serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kt" }

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.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip

publish.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'maven-publish'
-apply plugin: 'signing'
 
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
@@ -62,8 +61,19 @@ publishing {
         }
     }
 }
-
-signing {
-    useGpgCmd()
-    sign publishing.publications
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
 }

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":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI"},{"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","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/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

settings.gradle

@@ -1 +1,3 @@
 rootProject.name = 'saucenaoapi'
+
+enableFeaturePreview("VERSION_CATALOGS")

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt

@@ -159,3 +159,18 @@ data class ResultData(
     @SerialName("ext_urls")
     val extUrls: List<String> = emptyList()
 )
+
+val ResultData.froms: List<String>
+    get() = material ?.split(", ") ?: emptyList()
+
+val ResultData.authors: List<String>
+    get() = (creator ?.split(", ") ?: emptyList()) + (memberName ?.split(", ") ?: emptyList())
+
+val ResultData.charactersList: List<String>
+    get() = characters ?.split(", ") ?: emptyList()
+
+val ResultData.titles: List<String>
+    get() = title ?.split(", ") ?: emptyList()
+
+val ResultData.urls: List<String>
+    get() = extUrls + (url ?.split(", ") ?: emptyList())