Compare commits

...

9 Commits

Author SHA1 Message Date
renovate[bot]
bf1a09ff8d Update kt to v2.3.0 2025-12-16 12:42:55 +00:00
a97c117288 Merge pull request #199 from InsanusMokrassar/0.19.0
0.19.0
2025-10-04 23:47:44 +06:00
d5f09c6028 update github workflow java version 2025-10-04 23:19:11 +06:00
7cd2744a64 update repositories order 2025-10-04 23:15:08 +06:00
a2e2f48d53 add publication via nmcp 2025-10-04 23:09:08 +06:00
75f56f0aee update dependencies 2025-10-04 23:08:58 +06:00
b810fa40c2 start 0.19.0 2025-10-04 22:44:30 +06:00
081d567ba1 Update github_release.gradle 2024-12-09 10:15:32 +06:00
5a3b0362fa Merge pull request #191 from InsanusMokrassar/0.18.0
0.18.0
2024-12-09 10:11:54 +06:00
8 changed files with 83 additions and 63 deletions

View File

@@ -7,7 +7,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-java@v1 - uses: actions/setup-java@v1
with: with:
java-version: 11 java-version: 17
- name: Rewrite version - name: Rewrite version
run: | run: |
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"

View File

@@ -1,5 +1,14 @@
# SauceNaoAPI Changelog # 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 ## 0.18.0
* Versions: * Versions:

View File

@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
mavenLocal()
} }
dependencies { dependencies {
@@ -14,6 +14,7 @@ buildscript {
plugins { plugins {
alias(libs.plugins.multiplatform) alias(libs.plugins.multiplatform)
alias(libs.plugins.serialization) alias(libs.plugins.serialization)
alias(libs.plugins.nmcp.aggregation)
} }
project.version = "$library_version" project.version = "$library_version"
@@ -23,9 +24,9 @@ apply from: "publish.gradle"
apply from: "github_release.gradle" apply from: "github_release.gradle"
repositories { repositories {
mavenLocal()
mavenCentral() mavenCentral()
maven { url "https://nexus.inmo.dev/repository/maven-releases/" } maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
mavenLocal()
} }
kotlin { 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 { java {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17

View File

@@ -16,13 +16,13 @@ if (new File(projectDir, "secret.gradle").exists()) {
githubRelease { githubRelease {
token "${project.property('GITHUB_RELEASE_TOKEN')}" token "${project.property('GITHUB_RELEASE_TOKEN')}"
owner "InsanusMokrassar" owner = "InsanusMokrassar"
repo "${rootProject.name}" repo = "${rootProject.name}"
tagName "v${project.version}" tagName = "v${project.version}"
releaseName "${project.version}" releaseName = "${project.version}"
targetCommitish "${project.version}" targetCommitish = "${project.version}"
body getCurrentVersionChangelog() body = getCurrentVersionChangelog()
} }
} }

View File

@@ -1,3 +1,3 @@
kotlin.code.style=official kotlin.code.style=official
library_version=0.18.0 library_version=0.19.0

View File

@@ -1,15 +1,16 @@
[versions] [versions]
kt = "2.1.0" kt = "2.3.0"
kt-serialization = "1.7.3" kt-coroutines = "1.10.2"
kt-coroutines = "1.9.0" kt-serialization = "1.9.0"
klock = "5.4.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" gh-release = "2.5.2"
nmcp = "1.2.0"
[libraries] [libraries]
@@ -34,3 +35,5 @@ buildscript-gh-release = { module = "com.github.breadmoirai:github-release", ver
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kt" } multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kt" }
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kt" } serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kt" }
nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

View File

@@ -1,3 +1,4 @@
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
task javadocsJar(type: Jar) { task javadocsJar(type: Jar) {
@@ -19,59 +20,52 @@ publishing {
} }
developers { developers {
developer {
developer { id = "InsanusMokrassar"
id = "InsanusMokrassar" name = "Ovsyannikov Alexey"
name = "Ovsyannikov Alexey" email = "ovsyannikov.alexey95@gmail.com"
email = "ovsyannikov.alexey95@gmail.com" }
}
} }
licenses { licenses {
license {
license { name = "Apache Software License 2.0"
name = "Apache Software License 2.0" url = "https://github.com/InsanusMokrassar/SauceNaoAPI/blob/master/LICENSE"
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)) { repositories {
maven { if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
name = "GithubPackages" maven {
url = uri("https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI") 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') credentials {
password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD') 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 { if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
name = "InmoNexus" maven {
url = uri("https://nexus.inmo.dev/repository/maven-releases/") 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') credentials {
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD') 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 { if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
name = "sonatype" maven {
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") 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') credentials {
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') 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")) { if (project.hasProperty("signing.gnupg.keyName")) {
apply plugin: 'signing' apply plugin: 'signing'
signing { signing {
useGpgCmd() useGpgCmd()
sign publishing.publications sign publishing.publications
} }
task signAll { task signAll {
tasks.withType(Sign).forEach { tasks.withType(Sign).forEach {
dependsOn(it) dependsOn(it)