mirror of
https://github.com/InsanusMokrassar/KSLog.git
synced 2026-04-08 17:22:30 +00:00
Compare commits
1 Commits
1.2.3
...
fc2e1a4c2d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fc2e1a4c2d |
2
.github/workflows/kdocs.yml
vendored
2
.github/workflows/kdocs.yml
vendored
@@ -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: 17
|
java-version: 11
|
||||||
- name: Build
|
- name: Build
|
||||||
run: ./gradlew dokkaHtml
|
run: ./gradlew dokkaHtml
|
||||||
- name: Publish KDocs
|
- name: Publish KDocs
|
||||||
|
|||||||
2
.github/workflows/publish.yml
vendored
2
.github/workflows/publish.yml
vendored
@@ -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: 17
|
java-version: 11
|
||||||
- name: Rewrite version
|
- name: Rewrite version
|
||||||
run: |
|
run: |
|
||||||
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -12,5 +12,6 @@ out/
|
|||||||
secret.gradle
|
secret.gradle
|
||||||
local.*
|
local.*
|
||||||
local/
|
local/
|
||||||
|
kotlin-js-store/
|
||||||
|
|
||||||
publishing.sh
|
publishing.sh
|
||||||
|
|||||||
20
CHANGELOG.md
20
CHANGELOG.md
@@ -1,25 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## 1.2.3
|
|
||||||
|
|
||||||
* `Kotlin`: `1.9.20`
|
|
||||||
|
|
||||||
## 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`
|
|
||||||
* Latest supported android sdk now is `34`
|
|
||||||
|
|
||||||
## 1.2.0
|
|
||||||
|
|
||||||
* `Kotlin`: `1.9.0`
|
|
||||||
|
|
||||||
## 1.1.2
|
## 1.1.2
|
||||||
|
|
||||||
* `Kotlin`: `1.8.22`
|
* `Kotlin`: `1.8.22`
|
||||||
|
|||||||
10
build.gradle
10
build.gradle
@@ -19,7 +19,6 @@ 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"
|
||||||
@@ -45,13 +44,8 @@ kotlin {
|
|||||||
browser()
|
browser()
|
||||||
nodejs()
|
nodejs()
|
||||||
}
|
}
|
||||||
androidTarget {
|
android {
|
||||||
publishAllLibraryVariants()
|
publishAllLibraryVariants()
|
||||||
compilations.all {
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
linuxArm64()
|
linuxArm64()
|
||||||
linuxArm32Hfp()
|
linuxArm32Hfp()
|
||||||
@@ -61,7 +55,9 @@ kotlin {
|
|||||||
nodejs()
|
nodejs()
|
||||||
d8()
|
d8()
|
||||||
}
|
}
|
||||||
|
wasm32()
|
||||||
mingwX64()
|
mingwX64()
|
||||||
|
mingwX86()
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
commonMain {
|
commonMain {
|
||||||
|
|||||||
@@ -26,9 +26,8 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
compileSdk libs.versions.android.compileSdk.get().toInteger()
|
compileSdkVersion 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()
|
||||||
@@ -56,6 +55,10 @@ 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"
|
||||||
|
|||||||
@@ -10,5 +10,5 @@ org.gradle.jvmargs=-Xmx512m
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=1.2.3
|
version=1.1.2
|
||||||
android_code_version=25
|
android_code_version=21
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kotlin = "1.9.20"
|
kotlin = "1.9.0"
|
||||||
kotlin-gradle-plugin = "7.4.2"
|
kotlin-gradle-plugin = "7.4.2"
|
||||||
|
|
||||||
versions = "0.49.0"
|
dokka = "1.8.20"
|
||||||
|
|
||||||
dokka = "1.9.10"
|
|
||||||
|
|
||||||
dexcount = "4.0.0"
|
dexcount = "4.0.0"
|
||||||
junit_version = "4.12"
|
junit_version = "4.12"
|
||||||
@@ -13,8 +11,8 @@ test_ext_junit_version = "1.1.5"
|
|||||||
espresso_core = "3.5.1"
|
espresso_core = "3.5.1"
|
||||||
|
|
||||||
android-minSdk = "21"
|
android-minSdk = "21"
|
||||||
android-compileSdk = "34"
|
android-compileSdk = "33"
|
||||||
android-buildTools = "34.0.0"
|
android-buildTools = "33.0.1"
|
||||||
|
|
||||||
github-release = "2.4.1"
|
github-release = "2.4.1"
|
||||||
|
|
||||||
@@ -40,5 +38,3 @@ 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" }
|
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-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,7 +1,7 @@
|
|||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
task javadocsJar(type: Jar) {
|
task javadocsJar(type: Jar) {
|
||||||
archiveClassifier = 'javadoc'
|
classifier = 'javadoc'
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
|
|||||||
@@ -1 +1,3 @@
|
|||||||
rootProject.name = 'kslog'
|
rootProject.name = 'kslog'
|
||||||
|
|
||||||
|
enableFeaturePreview("VERSION_CATALOGS")
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
<manifest/>
|
|
||||||
@@ -32,10 +32,6 @@ 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 {
|
||||||
|
|||||||
1
src/main/AndroidManifest.xml
Normal file
1
src/main/AndroidManifest.xml
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<manifest package="dev.inmo.kslog"/>
|
||||||
4
src/wasm32Main/kotlin/defaultLogging.kt
Normal file
4
src/wasm32Main/kotlin/defaultLogging.kt
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
package dev.inmo.kslog.common
|
||||||
|
|
||||||
|
internal actual val defaultLogging: (level: LogLevel, tag: String, message: Any, throwable: Throwable?) -> Unit
|
||||||
|
get() = printlnLogging
|
||||||
4
src/wasmMain/kotlin/defaultLogging.kt
Normal file
4
src/wasmMain/kotlin/defaultLogging.kt
Normal file
@@ -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