Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '22'
java-version: '23'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
4 changes: 2 additions & 2 deletions eithernet/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ kotlin {
iosArm64()
iosSimulatorArm64()
js(IR) {
moduleName = property("POM_ARTIFACT_ID").toString()
outputModuleName.set(property("POM_ARTIFACT_ID").toString())
browser()
}
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
moduleName = property("POM_ARTIFACT_ID").toString()
outputModuleName.set(property("POM_ARTIFACT_ID").toString())
browser()
}
// endregion
Expand Down
4 changes: 4 additions & 0 deletions eithernet/test-fixtures/api/test-fixtures.api
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public final class com/slack/eithernet/test/EitherNetControllers_jvmKt {
}

public final class com/slack/eithernet/test/EndpointKey {
public static final field Companion Lcom/slack/eithernet/test/EndpointKey$Companion;
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Ljava/util/List;
public fun equals (Ljava/lang/Object;)Z
Expand All @@ -30,6 +31,9 @@ public final class com/slack/eithernet/test/EndpointKey {
public fun toString ()Ljava/lang/String;
}

public final class com/slack/eithernet/test/EndpointKey$Companion {
}

public final class com/slack/eithernet/test/JavaEitherNetControllers {
public static final fun enqueueFromJava (Lcom/slack/eithernet/test/EitherNetController;Ljava/lang/Class;Ljava/lang/String;Lcom/slack/eithernet/ApiResult;)V
}
Expand Down
2 changes: 2 additions & 0 deletions eithernet/test-fixtures/api/test-fixtures.klib.api
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ final class com.slack.eithernet.test/EndpointKey { // com.slack.eithernet.test/E
final fun equals(kotlin/Any?): kotlin/Boolean // com.slack.eithernet.test/EndpointKey.equals|equals(kotlin.Any?){}[0]
final fun hashCode(): kotlin/Int // com.slack.eithernet.test/EndpointKey.hashCode|hashCode(){}[0]
final fun toString(): kotlin/String // com.slack.eithernet.test/EndpointKey.toString|toString(){}[0]

final object Companion // com.slack.eithernet.test/EndpointKey.Companion|null[0]
}

final class com.slack.eithernet.test/ParameterKey { // com.slack.eithernet.test/ParameterKey|null[0]
Expand Down
6 changes: 3 additions & 3 deletions eithernet/test-fixtures/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ plugins {

kotlin {
// region KMP Targets
jvm { withJava() }
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
js(IR) {
moduleName = property("POM_ARTIFACT_ID").toString()
outputModuleName.set(property("POM_ARTIFACT_ID").toString())
browser()
}
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
moduleName = property("POM_ARTIFACT_ID").toString()
outputModuleName.set(property("POM_ARTIFACT_ID").toString())
browser()
}
// endregion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ package com.slack.eithernet.test
public data class EndpointKey
internal constructor(val name: String, val parameters: List<ParameterKey>) {
// Here for extension points
internal companion object
@PublishedApi internal companion object
}
7 changes: 3 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ org.jetbrains.compose.experimental.wasm.enabled=true
kotlin.mpp.stability.nowarn=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.apple.xcodeCompatibility.nowarn=true
# Ignore disabled targets (i.e iOS on Linux)
kotlin.native.ignoreDisabledTargets=true
kotlin.native.enableKlibsCrossCompilation=true

# Use KSP2
ksp.useKSP2=true
# https://youtrack.jetbrains.com/issue/KT-78504
kotlin.js.yarn=false

GROUP=com.slack.eithernet
VERSION_NAME=2.1.0-SNAPSHOT
Expand Down
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[versions]
coroutines = "1.9.0"
kotlin = "2.1.0"
jdk = "22"
coroutines = "1.10.2"
kotlin = "2.2.20"
jdk = "23"
jvmTarget = "11"
ksp = "2.1.0-1.0.29"
ktfmt = "0.53"
ksp = "2.2.20-2.0.3"
ktfmt = "0.54"
moshi = "1.15.1"
okhttp = "4.9.0"
okhttp = "5.1.0"
retrofit = "2.9.0"

[plugins]
binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.5" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
dokka = { id = "org.jetbrains.dokka", version = "2.1.0-Beta" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA4" }
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.34.0" }
spotless = { id = "com.diffplug.spotless", version = "7.2.1" }

[libraries]
androidProcessingApi = "com.google.android:android:4.1.1.4"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading