Skip to content

Commit 00652fe

Browse files
committed
Introduce jvmCommon source set
1 parent d25b04b commit 00652fe

File tree

13 files changed

+32
-77
lines changed

13 files changed

+32
-77
lines changed

jvm-utils/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

jvm-utils/build.gradle.kts

Lines changed: 0 additions & 15 deletions
This file was deleted.

logcat/build.gradle.kts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
@file:Suppress("UnstableApiUsage")
2+
@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
23

34
import com.vanniktech.maven.publish.JavadocJar
45
import com.vanniktech.maven.publish.KotlinMultiplatform
56
import com.vanniktech.maven.publish.SonatypeHost
7+
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
68
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
79

810
plugins {
@@ -33,7 +35,16 @@ kotlin {
3335
}
3436

3537
sourceSets {
36-
applyDefaultHierarchyTemplate()
38+
applyDefaultHierarchyTemplate {
39+
common {
40+
withCompilations { true }
41+
42+
group("jvmCommon") {
43+
withAndroidTarget()
44+
withJvm()
45+
}
46+
}
47+
}
3748

3849
commonMain {
3950
dependencies {
@@ -48,18 +59,6 @@ kotlin {
4859
implementation(libs.truthish)
4960
}
5061
}
51-
52-
androidMain {
53-
dependencies {
54-
implementation(project(":jvm-utils"))
55-
}
56-
}
57-
58-
jvmMain {
59-
dependencies {
60-
implementation(project(":jvm-utils"))
61-
}
62-
}
6362
}
6463
}
6564

logcat/src/androidMain/kotlin/logcat/BackwardCompatLogcat.android.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

logcat/src/androidMain/kotlin/logcat/Throwables.android.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
package logcat.internal
22

3-
43
internal expect fun <T> copyOnWriteArrayList(): MutableList<T>

jvm-utils/src/main/kotlin/logcat/utils.kt renamed to logcat/src/jvmCommonMain/kotlin/logcat/BackwardCompatLogcat.jvmCommon.kt

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
package logcat
1+
@file:JvmName("LogcatKt")
22

3-
import java.io.PrintWriter
4-
import java.io.StringWriter
3+
package logcat
54

6-
fun Throwable.customJvmStackTraceToString(): String {
7-
val stringWriter = StringWriter(256)
8-
val printWriter = PrintWriter(stringWriter, false)
9-
printStackTrace(printWriter)
10-
printWriter.flush()
11-
return stringWriter.toString()
12-
}
5+
import kotlin.jvm.JvmName
136

14-
fun Any.jvmOuterClassSimpleName(): String {
7+
@PublishedApi
8+
internal actual fun Any.outerClassSimpleNameInternalOnlyDoNotUseKThxBye(): String {
159
val javaClass = this::class.java
1610
val fullClassName = javaClass.name
1711
val outerClassName = fullClassName.substringBefore('$')
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@file:JvmName("ThrowablesKt")
2+
3+
package logcat
4+
5+
import java.io.PrintWriter
6+
import java.io.StringWriter
7+
import kotlin.jvm.JvmName
8+
9+
actual fun Throwable.asLog(): String {
10+
val stringWriter = StringWriter(256)
11+
val printWriter = PrintWriter(stringWriter, false)
12+
printStackTrace(printWriter)
13+
printWriter.flush()
14+
return stringWriter.toString()
15+
}

logcat/src/jvmMain/kotlin/logcat/BackwardCompatLogcat.jvm.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)