diff --git a/CHANGELOG.md b/CHANGELOG.md index 6084fb823f9..c3d57aac41c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.25.6 + +* `Versions`: + * `Kotlin`: `2.1.20` -> `2.1.21` + * `KSLog`: `1.4.1` -> `1.4.2` + * `Compose`: `1.7.3` -> `1.8.0` + * `Okio`: `3.10.2` -> `3.11.0` + ## 0.25.5 * `Versions`: diff --git a/github_release.gradle b/github_release.gradle index cf77598a4f8..7a41aa72913 100644 --- a/github_release.gradle +++ b/github_release.gradle @@ -11,12 +11,20 @@ private String getCurrentVersionChangelog() { return changelogDataOS.toString().trim() } -if (new File(projectDir, "secret.gradle").exists()) { - apply from: './secret.gradle' + +def githubTokenVariableName = "GITHUB_RELEASE_TOKEN" +def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName) + +def secretFile = new File(projectDir, "secret.gradle") +if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) { + if (secretFile.exists()) { + apply from: './secret.gradle' + } apply plugin: "com.github.breadmoirai.github-release" + def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv githubRelease { - token "${project.property('GITHUB_RELEASE_TOKEN')}" + token githubReleaseToken owner = "InsanusMokrassar" repo = "MicroUtils" diff --git a/gradle.properties b/gradle.properties index 1b495d7f670..fd79961a936 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.25.5 -android_code_version=295 +version=0.25.6 +android_code_version=296 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 630964d7234..e0fe7f3b3f3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -kt = "2.1.20" +kt = "2.1.21" kt-serialization = "1.8.1" kt-coroutines = "1.10.2" kotlinx-browser = "0.3" -kslog = "1.4.1" +kslog = "1.4.2" -jb-compose = "1.7.3" +jb-compose = "1.8.0" jb-exposed = "0.61.0" jb-dokka = "2.0.0" @@ -17,20 +17,20 @@ sqlite = "3.49.1.0" korlibs = "5.4.0" uuid = "0.8.4" -ktor = "3.1.2" +ktor = "3.1.3" gh-release = "2.5.2" koin = "4.0.4" -okio = "3.10.2" +okio = "3.11.0" ksp = "2.1.20-1.0.31" kotlin-poet = "1.18.1" versions = "0.51.0" -android-gradle = "8.7.+" +android-gradle = "8.9.+" dexcount = "4.0.0" android-coreKtx = "1.16.0" diff --git a/gradle/templates/publish.gradle b/gradle/templates/publish.gradle index e71a7ba4309..44103eb2b48 100644 --- a/gradle/templates/publish.gradle +++ b/gradle/templates/publish.gradle @@ -1,8 +1,51 @@ -if (ext.getProperties()["do_publish"] == false) { - return -} +import java.nio.charset.StandardCharsets +import java.net.http.HttpClient +import java.net.http.HttpRequest +import java.net.http.HttpResponse apply plugin: 'maven-publish' +// This script work based on https://ossrh-staging-api.central.sonatype.com/swagger-ui/#/default/manual_upload_repository +// and getting available open repos and just uploading them +if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { + def taskName = "uploadSonatypePublication" + if (rootProject.tasks.names.contains(taskName) == false) { + rootProject.tasks.register(taskName) { + doLast { + def username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') + def password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') + def bearer = Base64.getEncoder().encodeToString("$username:$password".getBytes(StandardCharsets.UTF_8)) + + def client = HttpClient.newHttpClient() + def request = HttpRequest.newBuilder() + .uri(URI.create("https://ossrh-staging-api.central.sonatype.com/manual/search/repositories?state=open")) + .GET() + .header("Content-Type", "application/json") + .header("Authorization", "Bearer $bearer") + .build() + + def response = client.send(request, HttpResponse.BodyHandlers.ofString()) + def keys = new ArrayList() + response.body().findAll("\"key\"[\\s]*:[\\s]*\"[^\"]+\"").forEach { + def key = it.find("[^\"]+\"\$").find("[^\"]+") + keys.add(key) + } + keys.forEach { + println("Start uploading $it") + def uploadRequest = HttpRequest.newBuilder() + .uri(URI.create("https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/$it?publishing_type=user_managed")) + .POST(HttpRequest.BodyPublishers.ofString("")) + .header("Content-Type", "application/json") + .header("Authorization", "Bearer $bearer") + .build() + def uploadResponse = client.send(uploadRequest, HttpResponse.BodyHandlers.ofString()) + if (uploadResponse.statusCode() != 200) { + throw IllegalStateException("Faced error of uploading for repo with key $it. Response: $uploadResponse") + } + } + } + } + } +} task javadocsJar(type: Jar) { archiveClassifier = 'javadoc' @@ -23,72 +66,64 @@ publishing { } developers { + developer { + id = "InsanusMokrassar" + name = "Aleksei Ovsiannikov" + email = "ovsyannikov.alexey95@gmail.com" + } - developer { - id = "InsanusMokrassar" - name = "Aleksei Ovsiannikov" - email = "ovsyannikov.alexey95@gmail.com" - } - - - developer { - id = "000Sanya" - name = "Syrov Aleksandr" - email = "000sanya.000sanya@gmail.com" - } - + developer { + id = "000Sanya" + name = "Syrov Aleksandr" + email = "000sanya.000sanya@gmail.com" + } } licenses { - - license { - name = "Apache Software License 2.0" - url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE" - } - + license { + name = "Apache Software License 2.0" + url = "https://github.com/InsanusMokrassar/MicroUtils/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/MicroUtils") - - 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/MicroUtils") + + 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://ossrh-staging-api.central.sonatype.com/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("signing.gnupg.keyName")) { apply plugin: 'signing' diff --git a/gradle/templates/publish.kpsb b/gradle/templates/publish.kpsb index 1fcc50538b8..36449579aa3 100644 --- a/gradle/templates/publish.kpsb +++ b/gradle/templates/publish.kpsb @@ -1 +1 @@ -{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}} \ No newline at end of file +{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":true}} \ No newline at end of file diff --git a/gradle/templates/publish_jvm.gradle b/gradle/templates/publish_jvm.gradle index 56080e5392e..fd61a46fa5d 100644 --- a/gradle/templates/publish_jvm.gradle +++ b/gradle/templates/publish_jvm.gradle @@ -1,4 +1,52 @@ +import java.nio.charset.StandardCharsets +import java.net.http.HttpClient +import java.net.http.HttpRequest +import java.net.http.HttpResponse + apply plugin: 'maven-publish' +// This script work based on https://ossrh-staging-api.central.sonatype.com/swagger-ui/#/default/manual_upload_repository +// and getting available open repos and just uploading them +if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) { + def taskName = "uploadSonatypePublication" + if (rootProject.tasks.names.contains(taskName) == false) { + rootProject.tasks.register(taskName) { + doLast { + def username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER') + def password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD') + def bearer = Base64.getEncoder().encodeToString("$username:$password".getBytes(StandardCharsets.UTF_8)) + + def client = HttpClient.newHttpClient() + def request = HttpRequest.newBuilder() + .uri(URI.create("https://ossrh-staging-api.central.sonatype.com/manual/search/repositories?state=open")) + .GET() + .header("Content-Type", "application/json") + .header("Authorization", "Bearer $bearer") + .build() + + def response = client.send(request, HttpResponse.BodyHandlers.ofString()) + def keys = new ArrayList() + response.body().findAll("\"key\"[\\s]*:[\\s]*\"[^\"]+\"").forEach { + def key = it.find("[^\"]+\"\$").find("[^\"]+") + keys.add(key) + } + keys.forEach { + println("Start uploading $it") + def uploadRequest = HttpRequest.newBuilder() + .uri(URI.create("https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/$it?publishing_type=user_managed")) + .POST(HttpRequest.BodyPublishers.ofString("")) + .header("Content-Type", "application/json") + .header("Authorization", "Bearer $bearer") + .build() + def uploadResponse = client.send(uploadRequest, HttpResponse.BodyHandlers.ofString()) + if (uploadResponse.statusCode() != 200) { + throw IllegalStateException("Faced error of uploading for repo with key $it. Response: $uploadResponse") + } + } + } + } + } +} + task javadocJar(type: Jar) { from javadoc @@ -55,42 +103,39 @@ 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/MicroUtils") - - 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/MicroUtils") + + 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://ossrh-staging-api.central.sonatype.com/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') } } } @@ -99,13 +144,13 @@ publishing { if (project.hasProperty("signing.gnupg.keyName")) { apply plugin: 'signing' - + signing { useGpgCmd() - + sign publishing.publications } - + task signAll { tasks.withType(Sign).forEach { dependsOn(it) diff --git a/gradle/templates/publish_jvm.kpsb b/gradle/templates/publish_jvm.kpsb index ed4995630c1..fe56af0efdf 100644 --- a/gradle/templates/publish_jvm.kpsb +++ b/gradle/templates/publish_jvm.kpsb @@ -1 +1 @@ -{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"} \ No newline at end of file +{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":true},"type":"JVM"} \ No newline at end of file