Merge pull request #47 from InsanusMokrassar/1.2.2

1.2.2
This commit is contained in:
InsanusMokrassar 2023-10-23 01:38:51 +06:00 committed by GitHub
commit 1a589c675e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 1952 additions and 27 deletions

View File

@ -10,7 +10,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: Build - name: Build
run: ./gradlew dokkaHtml run: ./gradlew dokkaHtml
- name: Publish KDocs - name: Publish KDocs

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

1
.gitignore vendored
View File

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

View File

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

View File

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

View File

@ -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 { defaultConfig {
minSdkVersion libs.versions.android.minSdk.get().toInteger() minSdkVersion libs.versions.android.minSdk.get().toInteger()

View File

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

View File

@ -1,11 +1,11 @@
[versions] [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" dexcount = "4.0.0"
junit_version = "4.12" junit_version = "4.12"

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-7.6.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

1921
kotlin-js-store/yarn.lock Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

@ -32,6 +32,10 @@ interface KSLog {
companion object : KSLog { companion object : KSLog {
private var defaultLogger: KSLog? = null 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 var default: KSLog
get() { get() {
return defaultLogger ?: KSLog("app").also { return defaultLogger ?: KSLog("app").also {

View File

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

View File

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