mirror of
https://github.com/InsanusMokrassar/KSLog.git
synced 2026-10-29 15:52:55 +00:00
Compare commits
33
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe9cdc19d3 | ||
|
|
333cb690a1 | ||
|
|
a3e6ccf973 | ||
|
|
9ce62e13f5 | ||
|
|
e88df8db99 | ||
|
|
8613f350e3 | ||
|
|
7fbf80a52a | ||
|
|
00da37e060 | ||
|
|
a779791a00 | ||
|
|
03cc000306 | ||
|
|
875d2d723e | ||
|
|
01722311e6 | ||
|
|
9b994de857 | ||
|
|
a170bbaa5c | ||
|
|
7b8d72e9c0 | ||
|
|
0237ec56c5 | ||
|
|
bef9e0c550 | ||
|
|
d7eb0093d8 | ||
|
|
deba12ed5d | ||
|
|
f608cf4bef | ||
|
|
4a656d2d90 | ||
|
|
c730f49fbd | ||
|
|
2a36f64b51 | ||
|
|
604ef1b347 | ||
|
|
dc50977c9a | ||
|
|
7c0650e2df | ||
|
|
387ca9097c | ||
|
|
a71405aff5 | ||
|
|
a2b497d0f9 | ||
|
|
c5974fb51c | ||
|
|
3240b63f21 | ||
|
|
fffafc4da7 | ||
|
|
b1d5ce2135 |
No files matched your search
@@ -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
|
||||||
|
|||||||
@@ -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 "[^/]*$"`"
|
||||||
|
|||||||
@@ -12,6 +12,5 @@ out/
|
|||||||
secret.gradle
|
secret.gradle
|
||||||
local.*
|
local.*
|
||||||
local/
|
local/
|
||||||
kotlin-js-store/
|
|
||||||
|
|
||||||
publishing.sh
|
publishing.sh
|
||||||
@@ -1,5 +1,27 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 1.2.1
|
||||||
|
|
||||||
|
* `Kotlin`: `1.9.10`
|
||||||
|
* Latest supported android sdk now is `34`
|
||||||
|
|
||||||
|
## 1.2.0
|
||||||
|
|
||||||
|
* `Kotlin`: `1.9.0`
|
||||||
|
|
||||||
|
## 1.1.2
|
||||||
|
|
||||||
|
* `Kotlin`: `1.8.22`
|
||||||
|
|
||||||
|
## 1.1.1
|
||||||
|
|
||||||
|
* Rollback `KSLog` with `String` arg factory to use `DefaultKSLog`
|
||||||
|
|
||||||
|
## 1.1.0
|
||||||
|
|
||||||
|
* `Kotlin`: `1.8.20`
|
||||||
|
* Standard factory `KSLog` with `String` arg now use `TagLogger`
|
||||||
|
|
||||||
## 1.0.0
|
## 1.0.0
|
||||||
|
|
||||||
* `Kotlin`: `1.8.0`
|
* `Kotlin`: `1.8.0`
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ It is simple and easy-to-use tool for logging on the most popular platforms in K
|
|||||||

|

|
||||||
|
|
||||||
[](https://insanusmokrassar.github.io/KSLog/)
|
[](https://insanusmokrassar.github.io/KSLog/)
|
||||||
[](https://bookstack.inmo.dev/books/kslog)
|
[](https://docs.inmo.dev/kslog/index.html)
|
||||||
|
|
||||||
By default, KSLog is using built-in tools for logging on each supported platform:
|
By default, KSLog is using built-in tools for logging on each supported platform:
|
||||||
|
|
||||||
|
|||||||
+19
-1
@@ -19,6 +19,7 @@ buildscript {
|
|||||||
plugins {
|
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)
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: "com.android.library"
|
apply plugin: "com.android.library"
|
||||||
@@ -44,12 +45,22 @@ kotlin {
|
|||||||
browser()
|
browser()
|
||||||
nodejs()
|
nodejs()
|
||||||
}
|
}
|
||||||
android {
|
androidTarget {
|
||||||
publishAllLibraryVariants()
|
publishAllLibraryVariants()
|
||||||
|
compilations.all {
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = "1.8"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
linuxArm64()
|
linuxArm64()
|
||||||
linuxArm32Hfp()
|
linuxArm32Hfp()
|
||||||
linuxX64()
|
linuxX64()
|
||||||
|
wasm {
|
||||||
|
browser()
|
||||||
|
nodejs()
|
||||||
|
d8()
|
||||||
|
}
|
||||||
wasm32()
|
wasm32()
|
||||||
mingwX64()
|
mingwX64()
|
||||||
mingwX86()
|
mingwX86()
|
||||||
@@ -60,6 +71,13 @@ kotlin {
|
|||||||
implementation libs.kotlin
|
implementation libs.kotlin
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
commonTest {
|
||||||
|
dependencies {
|
||||||
|
implementation libs.kotlin.test.common
|
||||||
|
implementation libs.kotlin.test.annotations.common
|
||||||
|
implementation libs.kotlin.test.junit
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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()
|
||||||
@@ -55,10 +56,6 @@ android {
|
|||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
String sep = File.separator
|
String sep = File.separator
|
||||||
main.java.srcDirs += "src${sep}main${sep}kotlin"
|
main.java.srcDirs += "src${sep}main${sep}kotlin"
|
||||||
|
|||||||
+3
-3
@@ -5,10 +5,10 @@ kotlin.incremental=true
|
|||||||
kotlin.incremental.js=true
|
kotlin.incremental.js=true
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
org.gradle.jvmargs=-Xmx196m
|
org.gradle.jvmargs=-Xmx512m
|
||||||
|
|
||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=1.0.0
|
version=1.2.1-test-version
|
||||||
android_code_version=18
|
android_code_version=23
|
||||||
@@ -1,18 +1,20 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kotlin = "1.8.0"
|
kotlin = "1.9.10"
|
||||||
kotlin-gradle-plugin = "7.3.0"
|
kotlin-gradle-plugin = "8.1.1"
|
||||||
|
|
||||||
dokka = "1.7.20"
|
versions = "0.48.0"
|
||||||
|
|
||||||
dexcount = "3.1.0"
|
dokka = "1.9.0"
|
||||||
|
|
||||||
|
dexcount = "4.0.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.12"
|
||||||
test_ext_junit_version = "1.1.3"
|
test_ext_junit_version = "1.1.5"
|
||||||
espresso_core = "3.4.0"
|
espresso_core = "3.5.1"
|
||||||
|
|
||||||
android-minSdk = "21"
|
android-minSdk = "21"
|
||||||
android-compileSdk = "33"
|
android-compileSdk = "34"
|
||||||
android-buildTools = "33.0.0"
|
android-buildTools = "34.0.0"
|
||||||
|
|
||||||
github-release = "2.4.1"
|
github-release = "2.4.1"
|
||||||
|
|
||||||
@@ -38,3 +40,5 @@ github-release = { module = "com.github.breadmoirai:github-release", version.ref
|
|||||||
|
|
||||||
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
|
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
|
||||||
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" }
|
||||||
+1
-1
@@ -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.5.1-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
|
||||||
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -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 {
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
|
"extends": [
|
||||||
|
"config:base"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -1,3 +1 @@
|
|||||||
rootProject.name = 'kslog'
|
rootProject.name = 'kslog'
|
||||||
|
|
||||||
enableFeaturePreview("VERSION_CATALOGS")
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<manifest/>
|
||||||
File renamed without changes.
@@ -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 {
|
||||||
@@ -68,7 +72,11 @@ internal val printlnLogging: (level: LogLevel, tag: String, message: Any, throwa
|
|||||||
|
|
||||||
fun KSLog(
|
fun KSLog(
|
||||||
defaultTag: String,
|
defaultTag: String,
|
||||||
messageFormatter: MessageFormatter = defaultMessageFormatter
|
): KSLog = DefaultKSLog(defaultTag)
|
||||||
|
|
||||||
|
fun KSLog(
|
||||||
|
defaultTag: String,
|
||||||
|
messageFormatter: MessageFormatter
|
||||||
): KSLog = DefaultKSLog(
|
): KSLog = DefaultKSLog(
|
||||||
defaultTag,
|
defaultTag,
|
||||||
messageFormatter
|
messageFormatter
|
||||||
@@ -79,11 +87,10 @@ fun KSLog(
|
|||||||
defaultTag: String,
|
defaultTag: String,
|
||||||
filter: MessageFilter,
|
filter: MessageFilter,
|
||||||
messageFormatter: MessageFormatter = defaultMessageFormatter
|
messageFormatter: MessageFormatter = defaultMessageFormatter
|
||||||
): KSLog = DefaultKSLog(
|
): KSLog = KSLog (
|
||||||
defaultTag,
|
defaultTag,
|
||||||
filter,
|
|
||||||
messageFormatter
|
messageFormatter
|
||||||
)
|
).filtered(filter)
|
||||||
|
|
||||||
fun KSLog(
|
fun KSLog(
|
||||||
defaultTag: String,
|
defaultTag: String,
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
<manifest package="dev.inmo.kslog"/>
|
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
package dev.inmo.kslog.common
|
||||||
|
|
||||||
|
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||||
|
get() = printlnLogging
|
||||||
Reference in new issue
Block a user