Skip to content

Commit e788c21

Browse files
committed
set kotlin-stdlib dependency as optional
1 parent 6bfb58c commit e788c21

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

buildSrc/src/main/kotlin/framefork.java.gradle.kts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import net.ltgt.gradle.errorprone.errorprone
22
import net.ltgt.gradle.nullaway.nullaway
33
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
4+
import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
45
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
56

67
plugins {
@@ -23,14 +24,23 @@ java {
2324
targetCompatibility = JavaVersion.VERSION_21
2425
}
2526

27+
kotlin {
28+
explicitApi()
29+
}
30+
2631
dependencies {
32+
val kotlinVersion = project.getKotlinPluginVersion()
33+
2734
api("org.jspecify:jspecify:1.0.0")
2835

2936
compileOnly("org.checkerframework:checker-qual:3.48.2")
3037

3138
errorprone("com.google.errorprone:error_prone_core:2.36.0")
3239
errorprone("com.uber.nullaway:nullaway:0.12.1")
3340

41+
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
42+
testImplementation("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
43+
3444
constraints {
3545
errorprone("org.checkerframework:checker-qual:3.48.2")
3646
errorprone("org.checkerframework:dataflow-errorprone:3.48.2")

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ org.gradle.warning.mode=all
99
org.gradle.java.installations.auto-detect=true
1010
org.gradle.java.installations.auto-download=false
1111

12+
kotlin.stdlib.default.dependency=false
1213
kapt.use.k2=true
1314
# Enable Kapt Incremental annotation processing requeste
1415
kapt.incremental.apt=true

modules/typed-ids/src/main/kotlin/org/framefork/typedIds/bigint/json/kotlinxSerialization/ObjectBigIntIdKotlinxSerializationModule.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import org.framefork.typedIds.bigint.ObjectBigIntIdTypeUtils
88
import org.framefork.typedIds.common.ReflectionHacks
99
import java.util.concurrent.ConcurrentHashMap
1010

11-
object ObjectBigIntIdKotlinxSerializationModule {
11+
public object ObjectBigIntIdKotlinxSerializationModule {
1212

1313
/**
14-
* Uses [org.framefork.typedIds.TypedIdsRegistry] to construct the module.
14+
* Uses [TypedIdsRegistry] to construct the module.
1515
* This requires the ID types are indexed compile-time.
1616
*/
17-
val fromIndex = SerializersModule {
17+
public val fromIndex: SerializersModule = SerializersModule {
1818
for (javaClass in TypedIdsRegistry.getObjectBigIntIdClasses()) {
1919
@Suppress("UNCHECKED_CAST")
2020
contextual(javaClass.kotlin, typedIdSerializerProvider(javaClass as Any as Class<out ObjectBigIntId<*>>))

modules/typed-ids/src/main/kotlin/org/framefork/typedIds/bigint/json/kotlinxSerialization/ObjectBigIntIdSerializer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import kotlinx.serialization.encoding.Decoder
88
import kotlinx.serialization.encoding.Encoder
99
import org.framefork.typedIds.bigint.ObjectBigIntId
1010

11-
open class ObjectBigIntIdSerializer<T : ObjectBigIntId<*>>(
11+
public open class ObjectBigIntIdSerializer<T : ObjectBigIntId<*>>(
1212
private val fromLongConstructor: (Long) -> T,
1313
) : KSerializer<T> {
1414

modules/typed-ids/src/main/kotlin/org/framefork/typedIds/uuid/json/kotlinxSerialization/ObjectUuidKotlinxSerializationModule.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import org.framefork.typedIds.uuid.ObjectUuidTypeUtils
99
import java.util.*
1010
import java.util.concurrent.ConcurrentHashMap
1111

12-
object ObjectUuidKotlinxSerializationModule {
12+
public object ObjectUuidKotlinxSerializationModule {
1313

1414
/**
15-
* Uses [org.framefork.typedIds.TypedIdsRegistry] to construct the module.
15+
* Uses [TypedIdsRegistry] to construct the module.
1616
* This requires the ID types are indexed compile-time.
1717
*/
18-
val fromIndex = SerializersModule {
18+
public val fromIndex: SerializersModule = SerializersModule {
1919
for (javaClass in TypedIdsRegistry.getObjectUuidClasses()) {
2020
@Suppress("UNCHECKED_CAST")
2121
contextual(javaClass.kotlin, typedIdSerializerProvider(javaClass as Any as Class<out ObjectUuid<*>>))

modules/typed-ids/src/main/kotlin/org/framefork/typedIds/uuid/json/kotlinxSerialization/ObjectUuidSerializer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import kotlinx.serialization.encoding.Encoder
99
import org.framefork.typedIds.uuid.ObjectUuid
1010
import java.util.*
1111

12-
open class ObjectUuidSerializer<T : ObjectUuid<*>>(
12+
public open class ObjectUuidSerializer<T : ObjectUuid<*>>(
1313
private val fromUuidConstructor: (UUID) -> T,
1414
) : KSerializer<T> {
1515

0 commit comments

Comments
 (0)