Compare commits

..

22 Commits

Author SHA1 Message Date
d25a73df3d remove unnecessary targets 2023-10-23 01:37:41 +06:00
333cb690a1 get back version of kslog 2023-09-22 01:52:15 +06:00
a3e6ccf973 get back build.gradle 2023-09-22 01:46:05 +06:00
9ce62e13f5 migrate onto build.gradle.kts 2023-09-20 22:27:06 +06:00
e88df8db99 update github workflows java toolchain versions 2023-09-20 21:45:39 +06:00
8613f350e3 update of gradle wrapper and publishing scripts 2023-09-20 21:39:01 +06:00
7fbf80a52a start 1.2.2 2023-09-20 20:04:27 +06:00
00da37e060 Merge pull request #45 from InsanusMokrassar/1.2.1
1.2.1
2023-09-06 19:05:58 +06:00
a779791a00 update dependencies 2023-09-06 19:05:12 +06:00
03cc000306 start 1.2.1 2023-09-06 19:02:59 +06:00
875d2d723e Merge pull request #41 from InsanusMokrassar/1.2.0
1.2.0
2023-07-28 12:21:55 +06:00
01722311e6 update kotlin and add versions plugin 2023-07-28 12:15:01 +06:00
9b994de857 start 1.2.0 2023-07-28 12:15:01 +06:00
a170bbaa5c Merge pull request #39 from InsanusMokrassar/1.1.2
1.1.2
2023-07-28 12:14:28 +06:00
7b8d72e9c0 update test dependencies 2023-06-19 22:47:41 +06:00
0237ec56c5 update dependencies 2023-06-19 22:46:45 +06:00
bef9e0c550 start 1.1.2 2023-06-19 22:40:16 +06:00
d7eb0093d8 Update README.md 2023-06-10 18:16:35 +06:00
deba12ed5d update dokka and gradle wrapper version 2023-06-09 12:08:57 +06:00
f608cf4bef Merge pull request #25 from InsanusMokrassar/renovate/configure
Configure Renovate
2023-04-25 12:27:29 +06:00
renovate[bot]
4a656d2d90 Add renovate.json 2023-04-18 08:23:00 +00:00
c730f49fbd Merge pull request #24 from InsanusMokrassar/1.1.1
1.1.1
2023-04-13 11:09:15 +06:00
21 changed files with 1980 additions and 35 deletions

View File

@@ -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

View File

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

1
.gitignore vendored
View File

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

View File

@@ -1,5 +1,25 @@
# 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`
* 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`

View File

@@ -10,7 +10,7 @@ It is simple and easy-to-use tool for logging on the most popular platforms in K
![Linux x64](https://img.shields.io/badge/Linuxx64-FCC624?style=for-the-badge&logo=linux&logoColor=F7DF1E)
[![KDocs](https://img.shields.io/badge/KDocs-323330?style=for-the-badge&logo=Kotlin&logoColor=7F52FF)](https://insanusmokrassar.github.io/KSLog/)
[![Tutorials](https://img.shields.io/badge/Tutorials-0288D1?style=for-the-badge&logo=bookstack&logoColor=white)](https://bookstack.inmo.dev/books/kslog)
[![Tutorials](https://img.shields.io/badge/Tutorials-0288D1?style=for-the-badge&logo=mkdocs&logoColor=white)](https://docs.inmo.dev/kslog/index.html)
By default, KSLog is using built-in tools for logging on each supported platform:

View File

@@ -19,6 +19,7 @@ buildscript {
plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.dokka)
alias(libs.plugins.versions)
}
apply plugin: "com.android.library"
@@ -44,8 +45,13 @@ kotlin {
browser()
nodejs()
}
android {
androidTarget {
publishAllLibraryVariants()
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}
linuxArm64()
linuxArm32Hfp()
@@ -55,9 +61,7 @@ kotlin {
nodejs()
d8()
}
wasm32()
mingwX64()
mingwX86()
sourceSets {
commonMain {

View File

@@ -26,8 +26,9 @@ android {
}
}
compileSdkVersion libs.versions.android.compileSdk.get().toInteger()
buildToolsVersion libs.versions.android.buildTools.get()
compileSdk libs.versions.android.compileSdk.get().toInteger()
buildToolsVersion = libs.versions.android.buildTools.get()
namespace "${group}.${project.name}"
defaultConfig {
minSdkVersion libs.versions.android.minSdk.get().toInteger()
@@ -55,10 +56,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
sourceSets {
String sep = File.separator
main.java.srcDirs += "src${sep}main${sep}kotlin"

View File

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

View File

@@ -1,18 +1,20 @@
[versions]
kotlin = "1.8.20"
kotlin-gradle-plugin = "7.3.1"
kotlin = "1.9.20-RC"
kotlin-gradle-plugin = "8.1.2"
dokka = "1.8.10"
versions = "0.48.0"
dokka = "1.9.10"
dexcount = "4.0.0"
junit_version = "4.12"
test_ext_junit_version = "1.1.3"
espresso_core = "3.4.0"
test_ext_junit_version = "1.1.5"
espresso_core = "3.5.1"
android-minSdk = "21"
android-compileSdk = "33"
android-buildTools = "33.0.1"
android-compileSdk = "34"
android-buildTools = "34.0.0"
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-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
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'
task javadocsJar(type: Jar) {
classifier = 'javadoc'
archiveClassifier = 'javadoc'
}
publishing {

6
renovate.json Normal file
View File

@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
]
}

View File

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

View File

@@ -0,0 +1 @@
<manifest/>

View File

@@ -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 {

View File

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

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