Compare commits

..

1 Commits

Author SHA1 Message Date
renovate[bot]
88f8b71fb9 Update dependency org.jetbrains.kotlin.multiplatform to v1.9.0 2023-07-06 23:53:23 +00:00
19 changed files with 34 additions and 1973 deletions

View File

@@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 17
java-version: 11
- 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: 17
java-version: 11
- name: Rewrite version
run: |
branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"

1
.gitignore vendored
View File

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

View File

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

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

View File

@@ -26,9 +26,8 @@ android {
}
}
compileSdk libs.versions.android.compileSdk.get().toInteger()
buildToolsVersion = libs.versions.android.buildTools.get()
namespace "${group}.${project.name}"
compileSdkVersion libs.versions.android.compileSdk.get().toInteger()
buildToolsVersion libs.versions.android.buildTools.get()
defaultConfig {
minSdkVersion libs.versions.android.minSdk.get().toInteger()
@@ -56,6 +55,10 @@ 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.2.2
android_code_version=24
version=1.1.1
android_code_version=20

View File

@@ -1,20 +1,18 @@
[versions]
kotlin = "1.9.20-RC"
kotlin-gradle-plugin = "8.1.2"
kotlin = "1.9.0"
kotlin-gradle-plugin = "7.3.1"
versions = "0.48.0"
dokka = "1.9.10"
dokka = "1.8.20"
dexcount = "4.0.0"
junit_version = "4.12"
test_ext_junit_version = "1.1.5"
espresso_core = "3.5.1"
test_ext_junit_version = "1.1.3"
espresso_core = "3.4.0"
android-minSdk = "21"
android-compileSdk = "34"
android-buildTools = "34.0.0"
android-compileSdk = "33"
android-buildTools = "33.0.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-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-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

@@ -32,10 +32,6 @@ 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

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

View 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

View 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