Merge pull request #47 from InsanusMokrassar/1.2.2

1.2.2

.github/workflows/kdocs.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build
         run: ./gradlew dokkaHtml
       - name: Publish KDocs

.github/workflows/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 "[^/]*$"`"

.gitignore

@@ -12,6 +12,5 @@ out/
 secret.gradle
 local.*
 local/
-kotlin-js-store/
 
 publishing.sh

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.2.2
+
+**wasm32 target has been removed**
+**mingwX86 target has been removed**
+
+* `Kotlin`: `1.9.20-RC`
+
 ## 1.2.1
 
 * `Kotlin`: `1.9.10`

build.gradle

@@ -45,8 +45,13 @@ kotlin {
         browser()
         nodejs()
     }
-    android {
+    androidTarget {
         publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
     }
     linuxArm64()
     linuxArm32Hfp()
@@ -56,9 +61,7 @@ kotlin {
         nodejs()
         d8()
     }
-    wasm32()
     mingwX64()
-    mingwX86()
 
     sourceSets {
         commonMain {

defaultAndroidSettings.gradle

@@ -26,8 +26,9 @@ android {
         }
     }
 
-    compileSdkVersion libs.versions.android.compileSdk.get().toInteger()
+    compileSdk libs.versions.android.compileSdk.get().toInteger()
-    buildToolsVersion libs.versions.android.buildTools.get()
+    buildToolsVersion = libs.versions.android.buildTools.get()
+    namespace "${group}.${project.name}"
 
     defaultConfig {
         minSdkVersion libs.versions.android.minSdk.get().toInteger()

gradle.properties

@@ -10,5 +10,5 @@ org.gradle.jvmargs=-Xmx512m
 # Project data
 
 group=dev.inmo
-version=1.2.1
+version=1.2.2
-android_code_version=23
+android_code_version=24

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
 
-kotlin = "1.9.10"
+kotlin = "1.9.20-RC"
-kotlin-gradle-plugin = "7.4.2"
+kotlin-gradle-plugin = "8.1.2"
 
-versions = "0.47.0"
+versions = "0.48.0"
 
-dokka = "1.9.0"
+dokka = "1.9.10"
 
 dexcount = "4.0.0"
 junit_version = "4.12"

gradle/wrapper/gradle-wrapper.properties

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

publish.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
 }
 
 publishing {

settings.gradle

@@ -1,3 +1 @@
 rootProject.name = 'kslog'
-
-enableFeaturePreview("VERSION_CATALOGS")

src/androidMain/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="dev.inmo.kslog"/>
+<manifest/>

src/commonMain/kotlin/KSLog.kt

@@ -32,6 +32,10 @@ interface KSLog {
 
     companion object : KSLog {
         private var defaultLogger: KSLog? = null
+
+        /**
+         * Default logger used in case you are trying to use [KSLog] as a receiver for extensions like [info]
+         */
         var default: KSLog
             get() {
                 return defaultLogger ?: KSLog("app").also {

src/wasm32Main/kotlin/defaultLogging.kt

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

src/wasmMain/kotlin/defaultLogging.kt

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