Skip to content

Commit 2682371

Browse files
authored
fixed some warnings (#282)
1 parent 4f54052 commit 2682371

File tree

14 files changed

+438
-437
lines changed

14 files changed

+438
-437
lines changed

build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ kotlin {
5050
}
5151
}
5252
}
53-
js(BOTH) {
53+
js(IR) {
5454
browser {
5555
testTask {
5656
useKarma {
@@ -121,7 +121,7 @@ kotlin {
121121
val androidMain by getting {
122122
dependsOn(javaMain)
123123
}
124-
val androidTest by getting {
124+
val androidUnitTest by getting {
125125
dependencies {
126126
implementation(kotlin("test"))
127127
implementation("org.junit.jupiter:junit-jupiter-engine:${extra["junit_version"]}")
@@ -266,6 +266,7 @@ android {
266266
testOptions {
267267
unitTests.isReturnDefaultValues = true
268268
}
269+
namespace = "io.github.oshai"
269270
}
270271
spotless {
271272
kotlin {

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ kotlin.native.ignoreDisabledTargets=true
33
# workaround for https://github.com/gradle/gradle/issues/11412
44
systemProp.org.gradle.internal.publish.checksums.insecure=true
55
org.gradle.jvmargs=-Xmx2048m
6+
# see https://kotlinlang.org/docs/whatsnew18.html#sourcedirectories
7+
kotlin.mpp.androidSourceSetLayoutVersion=2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="io.github.oshai" />
2+
<manifest />

src/androidMain/kotlin/io/github/oshai/KLogger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public actual interface KLogger {
7070
public actual fun error(marker: Marker?, t: Throwable?, msg: () -> Any?)
7171

7272
/** Add a log message with all the supplied parameters along with method name */
73-
public actual fun entry(vararg argArray: Any?)
73+
public actual fun entry(vararg arguments: Any?)
7474

7575
/** Add log message indicating exit of a method */
7676
public actual fun exit()

src/androidMain/kotlin/io/github/oshai/internal/KLoggerAndroid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ internal class KLoggerAndroid(override val name: String) : KLogger {
7878

7979
override fun error(marker: Marker?, t: Throwable?, msg: () -> Any?) = error(t, msg)
8080

81-
override fun entry(vararg argArray: Any?) = trace { "entry($argArray)" }
81+
override fun entry(vararg arguments: Any?) = trace { "entry($arguments)" }
8282

8383
override fun exit() = trace { "exit()" }
8484

src/commonMain/kotlin/io/github/oshai/KLogger.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public expect interface KLogger {
7575
public fun error(marker: Marker?, t: Throwable?, msg: () -> Any?)
7676

7777
/** Add a log message with all the supplied parameters along with method name */
78-
public fun entry(vararg argArray: Any?)
78+
public fun entry(vararg arguments: Any?)
7979

8080
/** Add log message indicating exit of a method */
8181
public fun exit()
@@ -212,7 +212,7 @@ public interface ActualKLogger {
212212
public fun error(marker: Marker?, t: Throwable?, msg: () -> Any?)
213213

214214
/** Add a log message with all the supplied parameters along with method name */
215-
public fun entry(vararg argArray: Any?)
215+
public fun entry(vararg arguments: Any?)
216216

217217
/** Add log message indicating exit of a method */
218218
public fun exit()

src/jsMain/kotlin/io/github/oshai/internal/KLoggerJS.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ internal class KLoggerJS(override val name: String) : KLogger {
110110
}
111111
}
112112

113-
override fun entry(vararg argArray: Any?) {
114-
TRACE.logIfEnabled(name, { "entry($argArray)" }, APPENDER::trace)
113+
override fun entry(vararg arguments: Any?) {
114+
TRACE.logIfEnabled(name, { "entry($arguments)" }, APPENDER::trace)
115115
}
116116

117117
override fun exit() {

0 commit comments

Comments
 (0)