Compare commits

...

28 Commits

Author SHA1 Message Date
renovate[bot]
d02e40474e Update dependency com.android.tools.build:gradle to 8.13.+ 2025-09-30 17:20:23 +00:00
8c0968ba86 Merge pull request #108 from InsanusMokrassar/1.5.1
1.5.1
2025-09-30 23:19:40 +06:00
526de46a98 update dependencies 2025-09-30 23:19:00 +06:00
0af8c78e37 start 1.5.1 2025-09-30 23:12:06 +06:00
6840598e04 fix publishing? 2025-06-30 20:28:52 +06:00
7a2d070ee3 fix of publishing scripts 2025-06-30 18:02:47 +06:00
92651d3ba6 Merge pull request #101 from InsanusMokrassar/1.5.0
1.5.0
2025-06-30 14:43:28 +06:00
b8c72f1131 update dependencies 2025-06-29 18:46:36 +06:00
9b92fa29f4 start 1.5.0 2025-06-29 18:36:26 +06:00
42ced6edd2 Update github_release.gradle 2025-05-16 12:38:00 +06:00
dd3e4c4c2a Update github_release.gradle 2025-05-16 12:20:39 +06:00
f528909915 Merge pull request #98 from InsanusMokrassar/1.4.2
1.4.2
2025-05-16 09:05:00 +06:00
b3919c8439 update dependencies 2025-05-16 08:58:52 +06:00
d1dd159e36 update publication script 2025-05-16 08:55:04 +06:00
3db55982e9 start 1.4.2 2025-05-16 08:48:08 +06:00
8e477b1056 Merge pull request #95 from InsanusMokrassar/1.4.1
1.4.1
2025-01-29 12:36:18 +06:00
480d2c8132 update dependencies 2025-01-29 12:06:52 +06:00
a2a73dfe83 start 1.4.1 2025-01-29 12:06:20 +06:00
4528918347 Merge pull request #92 from InsanusMokrassar/renovate/major-dokka
Update dokka to v2 (major)
2025-01-10 08:21:30 +06:00
renovate[bot]
9ef93724ad Update dokka to v2 2024-12-21 02:49:05 +00:00
dccbd13788 Merge pull request #90 from InsanusMokrassar/1.4.0
1.4.0
2024-12-09 10:10:09 +06:00
8bb34d6842 update dependencies 2024-12-09 10:04:09 +06:00
cff3f71de7 start 1.4.0 2024-12-09 10:03:14 +06:00
aab0ac064f Merge pull request #87 from InsanusMokrassar/1.3.6
1.3.6
2024-08-27 19:13:32 +06:00
d2909ed5f0 update dependencies 2024-08-27 19:12:58 +06:00
81eba88ce9 start 1.3.6 2024-08-27 19:01:11 +06:00
a73f0d132c remove kotlin-js-store 2024-08-27 19:00:22 +06:00
bd87184f81 Merge pull request #84 from InsanusMokrassar/1.3.5
1.3.5
2024-08-09 23:07:10 +06:00
10 changed files with 108 additions and 2085 deletions

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
.idea .idea
.kotlin .kotlin
kotlin-js-store/
out/* out/*
*.iml *.iml
target target

View File

@@ -1,5 +1,30 @@
# Changelog # Changelog
## 1.5.1
* `Kotlin`: `2.2.20`
## 1.5.0
* `Kotlin`: `2.2.0`
## 1.4.2
* `Kotlin`: `2.1.21`
* Android SDK Level: `36`
## 1.4.1
* `Kotlin`: `2.1.10`
## 1.4.0
* `Kotlin`: `2.1.0`
## 1.3.6
* `Kotlin`: `2.0.20`
## 1.3.5 ## 1.3.5
* `Kotlin`: `2.0.10` * `Kotlin`: `2.0.10`

View File

@@ -20,9 +20,29 @@ plugins {
alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.dokka) alias(libs.plugins.kotlin.dokka)
alias(libs.plugins.versions) alias(libs.plugins.versions)
alias(libs.plugins.nmcp.aggregation)
} }
apply plugin: "com.android.library" apply plugin: "com.android.library"
apply from: "defaultAndroidSettings.gradle"
apply from: "github_release.gradle"
apply from: "publish.gradle"
apply from: "dokka.gradle"
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()
}
}
project.version = "$version" project.version = "$version"
project.group = "$group" project.group = "$group"
@@ -87,9 +107,3 @@ java {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
} }
apply from: "defaultAndroidSettings.gradle"
apply from: "github_release.gradle"
apply from: "publish.gradle"
apply from: "dokka.gradle"

View File

@@ -11,12 +11,20 @@ private String getCurrentVersionChangelog() {
return changelogDataOS.toString().trim() 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" apply plugin: "com.github.breadmoirai.github-release"
def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv
githubRelease { githubRelease {
token "${project.property('GITHUB_RELEASE_TOKEN')}" token githubReleaseToken
owner = "InsanusMokrassar" owner = "InsanusMokrassar"
repo = "KSLog" repo = "KSLog"

View File

@@ -10,5 +10,5 @@ org.gradle.jvmargs=-Xmx512m
# Project data # Project data
group=dev.inmo group=dev.inmo
version=1.3.5 version=1.5.1
android_code_version=32 android_code_version=38

View File

@@ -1,20 +1,21 @@
[versions] [versions]
kotlin = "2.0.10" kotlin = "2.2.20"
kotlin-gradle-plugin = "8.3.2" kotlin-gradle-plugin = "8.13.+"
nmcp = "1.2.0"
versions = "0.51.0" versions = "0.51.0"
dokka = "1.9.20" dokka = "2.0.0"
dexcount = "4.0.0" dexcount = "4.0.0"
junit_version = "4.12" junit_version = "4.12"
test_ext_junit_version = "1.2.1" test_ext_junit_version = "1.3.0"
espresso_core = "3.6.1" espresso_core = "3.7.0"
android-minSdk = "21" android-minSdk = "21"
android-compileSdk = "35" android-compileSdk = "36"
android-buildTools = "35.0.0" android-buildTools = "36.0.0"
github-release = "2.5.2" github-release = "2.5.2"
@@ -42,3 +43,5 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

File diff suppressed because it is too large Load Diff

View File

@@ -1,3 +1,4 @@
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
task javadocsJar(type: Jar) { task javadocsJar(type: Jar) {
@@ -19,66 +20,47 @@ publishing {
} }
developers { developers {
developer {
developer { id = "Akkihi"
id = "Akkihi" name = "Akkihi"
name = "Akkihi" email = "akkihiguy@gmail.com"
email = "akkihiguy@gmail.com" }
}
developer { developer {
id = "InsanusMokrassar" id = "InsanusMokrassar"
name = "InsanusMokrassar" name = "InsanusMokrassar"
email = "ovsyannikov.alexey95@gmail.com" email = "ovsyannikov.alexey95@gmail.com"
} }
} }
licenses { licenses {
license {
license { name = "MIT License"
name = "MIT License" url = "https://opensource.org/licenses/MIT"
url = "https://opensource.org/licenses/MIT" }
}
} }
} }
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('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
name = "GithubPackages" maven {
url = uri("https://maven.pkg.github.com/InsanusMokrassar/KSLog") name = "InmoNexus"
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
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('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 { if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
name = "InmoNexus" maven {
url = uri("https://nexus.inmo.dev/repository/maven-releases/") name = "sonatype"
url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
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('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')
}
} }
} }
} }
@@ -87,13 +69,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)

View File

@@ -1 +1 @@
{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"Simple logging library for kotlin","url":"https://github.com/InsanusMokrassar/KSLog","vcsUrl":"https://github.com/InsanusMokrassar/KSLog.git","developers":[{"id":"Akkihi","name":"Akkihi","eMail":"akkihiguy@gmail.com"},{"id":"InsanusMokrassar","name":"InsanusMokrassar","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/KSLog"},{"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"}}} {"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"Simple logging library for kotlin","url":"https://github.com/InsanusMokrassar/KSLog","vcsUrl":"https://github.com/InsanusMokrassar/KSLog.git","developers":[{"id":"Akkihi","name":"Akkihi","eMail":"akkihiguy@gmail.com"},{"id":"InsanusMokrassar","name":"InsanusMokrassar","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"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"}}}