Compare commits

..

14 Commits

16 changed files with 1960 additions and 22 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,14 @@
# 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`

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

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.2
android_code_version=21
version=1.2.1-test-version
android_code_version=23

View File

@@ -1,9 +1,11 @@
[versions]
kotlin = "1.8.22"
kotlin-gradle-plugin = "7.4.2"
kotlin = "1.9.10"
kotlin-gradle-plugin = "8.1.1"
dokka = "1.8.20"
versions = "0.48.0"
dokka = "1.9.0"
dexcount = "4.0.0"
junit_version = "4.12"
@@ -11,8 +13,8 @@ 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.6.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 {

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"/>