Compare commits

...

11 Commits

14 changed files with 1952 additions and 19 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,10 @@
# Changelog # Changelog
## 1.2.1
* `Kotlin`: `1.9.10`
* Latest supported android sdk now is `34`
## 1.2.0 ## 1.2.0
* `Kotlin`: `1.9.0` * `Kotlin`: `1.9.0`

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()

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.0 version=1.2.1-test-version
android_code_version=22 android_code_version=23

View File

@@ -1,11 +1,11 @@
[versions] [versions]
kotlin = "1.9.0" kotlin = "1.9.10"
kotlin-gradle-plugin = "7.4.2" kotlin-gradle-plugin = "8.1.1"
versions = "0.47.0" versions = "0.48.0"
dokka = "1.8.20" dokka = "1.9.0"
dexcount = "4.0.0" dexcount = "4.0.0"
junit_version = "4.12" junit_version = "4.12"
@@ -13,8 +13,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 = "33" android-compileSdk = "34"
android-buildTools = "33.0.2" android-buildTools = "34.0.0"
github-release = "2.4.1" github-release = "2.4.1"

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 {