Merge 20bd48a383 into 24adeef67b

.gitignore

@@ -1,6 +1,4 @@
 .idea
-.kotlin
-kotlin-js-store/
 out/*
 *.iml
 target
@@ -14,6 +12,5 @@ out/
 secret.gradle
 local.*
 local/
-**/*.local.*
 
 publishing.sh

CHANGELOG.md

@@ -1,44 +1,5 @@
 # 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
-
-* `Kotlin`: `2.0.10`
-* Android SDK Level: `35`
-
-## 1.3.4
-
-* `Kotlin`: `1.9.24`
-* Native realization of `KSLoggerDefaultPlatformLoggerLambda` now is common for all native targets
-
-## 1.3.3
-
-* `Kotlin`: `1.9.23`
-
 ## 1.3.2
 
 * `Kotlin`: `1.9.22`

build.gradle

@@ -20,29 +20,9 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.versions)
-    alias(libs.plugins.nmcp.aggregation)
 }
 
 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.group = "$group"
@@ -93,10 +73,6 @@ kotlin {
             dependencies {
                 implementation libs.kotlin.test.common
                 implementation libs.kotlin.test.annotations.common
-            }
-        }
-        jvmTest {
-            dependencies {
                 implementation libs.kotlin.test.junit
             }
         }
@@ -107,3 +83,9 @@ java {
     sourceCompatibility = 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"

github_release.gradle

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

gradle.properties

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

gradle/libs.versions.toml

@@ -1,21 +1,20 @@
 [versions]
 
-kotlin = "2.2.20"
-kotlin-gradle-plugin = "8.10.+"
+kotlin = "1.9.22"
+kotlin-gradle-plugin = "8.3.0"
 
-nmcp = "1.2.0"
-versions = "0.51.0"
+versions = "0.50.0"
 
-dokka = "2.0.0"
+dokka = "1.9.10"
 
 dexcount = "4.0.0"
 junit_version = "4.12"
-test_ext_junit_version = "1.3.0"
-espresso_core = "3.7.0"
+test_ext_junit_version = "1.1.5"
+espresso_core = "3.5.1"
 
 android-minSdk = "21"
-android-compileSdk = "36"
-android-buildTools = "36.0.0"
+android-compileSdk = "34"
+android-buildTools = "34.0.0"
 
 github-release = "2.5.2"
 
@@ -43,5 +42,3 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
 kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 
 versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
-
-nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

gradle/wrapper/gradle-wrapper.properties

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

publish.gradle

@@ -1,4 +1,3 @@
-
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
@@ -20,47 +19,66 @@ publishing {
             }
 
             developers {
-                developer {
-                    id = "Akkihi"
-                    name = "Akkihi"
-                    email = "akkihiguy@gmail.com"
-                }
+                
+                    developer {
+                        id = "Akkihi"
+                        name = "Akkihi"
+                        email = "akkihiguy@gmail.com"
+                    }
+                
 
-                developer {
-                    id = "InsanusMokrassar"
-                    name = "InsanusMokrassar"
-                    email = "ovsyannikov.alexey95@gmail.com"
-                }
+                    developer {
+                        id = "InsanusMokrassar"
+                        name = "InsanusMokrassar"
+                        email = "ovsyannikov.alexey95@gmail.com"
+                    }
+                
             }
 
             licenses {
-                license {
-                    name = "MIT License"
-                    url = "https://opensource.org/licenses/MIT"
-                }
+                
+                    license {
+                        name = "MIT License"
+                        url = "https://opensource.org/licenses/MIT"
+                    }
+                
             }
         }
-    }
-    repositories {
-        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')
+        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/KSLog")
+            
+                    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('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('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')
+                    }
+            
                 }
             }
         }
@@ -69,13 +87,13 @@ publishing {
     
 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":"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"}}}
+{"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"}}}

src/linuxArm64Main/kotlin/KSLoggerDefaultPlatformLoggerLambda.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+actual var KSLoggerDefaultPlatformLoggerLambda: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit =
+    printlnLogging

src/linuxX64Main/kotlin/KSLoggerDefaultPlatformLoggerLambda.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+actual var KSLoggerDefaultPlatformLoggerLambda: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit =
+    printlnLogging

src/mingwX64Main/kotlin/KSLoggerDefaultPlatformLoggerLambda.kt

@@ -0,0 +1,4 @@
+package dev.inmo.kslog.common
+
+actual var KSLoggerDefaultPlatformLoggerLambda: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit =
+    printlnLogging