Merge pull request #199 from InsanusMokrassar/0.19.0

0.19.0
2025-11-16 19:30:10 +00:00 · 2025-10-04 23:47:44 +06:00
parent 081d567ba1 d5f09c6028
commit a97c117288
7 changed files with 77 additions and 57 deletions
--- a/.github/workflows/build_and_publish.yml
+++ b/.github/workflows/build_and_publish.yml
@@ -7,7 +7,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-java@v1
        with:
-          java-version: 11
+          java-version: 17
      - name: Rewrite version
        run: |
          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # SauceNaoAPI Changelog

+## 0.19.0
+
+* Versions:
+  * `Kotlin`: `2.2.20`
+  * `Coroutines`: `1.10.2`
+  * `Serialization`: `1.9.0`
+  * `Ktor`: `3.3.0`
+  * `MicroUtils`: `0.26.5`
+
 ## 0.18.0

 * Versions:
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
    repositories {
-        mavenLocal()
        mavenCentral()
+        mavenLocal()
    }

    dependencies {
@@ -14,6 +14,7 @@ buildscript {
 plugins {
    alias(libs.plugins.multiplatform)
    alias(libs.plugins.serialization)
+    alias(libs.plugins.nmcp.aggregation)
 }

 project.version = "$library_version"
@@ -23,9 +24,9 @@ apply from: "publish.gradle"
 apply from: "github_release.gradle"

 repositories {
-    mavenLocal()
    mavenCentral()
    maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
+    mavenLocal()
 }

 kotlin {
@@ -78,6 +79,19 @@ kotlin {
    }
 }

+if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+    nmcpAggregation {
+        centralPortal {
+            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')
+            validationTimeout = Duration.ofHours(4)
+            publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
+        }
+
+        publishAllProjectsProbablyBreakingProjectIsolation()
+    }
+}
+
 java {
    sourceCompatibility = JavaVersion.VERSION_17
    targetCompatibility = JavaVersion.VERSION_17
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 kotlin.code.style=official

-library_version=0.18.0
+library_version=0.19.0
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,15 +1,16 @@
 [versions]

-kt = "2.1.0"
-kt-serialization = "1.7.3"
-kt-coroutines = "1.9.0"
+kt = "2.2.20"
+kt-coroutines = "1.10.2"
+kt-serialization = "1.9.0"

 klock = "5.4.0"
-ktor = "3.0.2"
+ktor = "3.3.0"

-microutils = "0.23.2"
+microutils = "0.26.5"

 gh-release = "2.5.2"
+nmcp = "1.2.0"

 [libraries]

@@ -34,3 +35,5 @@ buildscript-gh-release = { module = "com.github.breadmoirai:github-release", ver

 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kt" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kt" }
+
+nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }
--- 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-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
--- a/publish.gradle
+++ b/publish.gradle
@@ -1,3 +1,4 @@
+
 apply plugin: 'maven-publish'

 task javadocsJar(type: Jar) {
@@ -19,59 +20,52 @@ publishing {
            }

            developers {
-                
-                    developer {
-                        id = "InsanusMokrassar"
-                        name = "Ovsyannikov Alexey"
-                        email = "ovsyannikov.alexey95@gmail.com"
-                    }
-                
+                developer {
+                    id = "InsanusMokrassar"
+                    name = "Ovsyannikov Alexey"
+                    email = "ovsyannikov.alexey95@gmail.com"
+                }
            }

            licenses {
-                
-                    license {
-                        name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/SauceNaoAPI/blob/master/LICENSE"
-                    }
-                
+                license {
+                    name = "Apache Software License 2.0"
+                    url = "https://github.com/InsanusMokrassar/SauceNaoAPI/blob/master/LICENSE"
+                }
            }
        }
-        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')
-                    }
-            
+    }
+    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('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                maven {
-                    name = "InmoNexus"
-                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-            
-                    credentials {
-                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-                    }
-            
+        }
+        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+            maven {
+                name = "InmoNexus"
+                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+        
+                credentials {
+                    username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                    password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_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')
-                    }
-            
+        }
+        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')
                }
            }
        }
@@ -80,13 +74,13 @@ publishing {
    
 if (project.hasProperty("signing.gnupg.keyName")) {
    apply plugin: 'signing'
-    
+
    signing {
        useGpgCmd()
-    
+
        sign publishing.publications
    }
-    
+
    task signAll {
        tasks.withType(Sign).forEach {
            dependsOn(it)