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/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ jobs:
uses: gradle/actions/setup-gradle@v4

- name: Check Binary Compatibility
run: ./gradlew apiCheck
run: ./gradlew checkLegacyAbi
30 changes: 5 additions & 25 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlinx.serialization)
alias(libs.plugins.kotlinter)
alias(libs.plugins.publish)
alias(libs.plugins.binaryCompatibilityValidator)
alias(libs.plugins.kover)
alias(libs.plugins.detekt)
}

group = "me.devnatan"
Expand Down Expand Up @@ -37,6 +33,11 @@ repositories {
kotlin {
explicitApi()

@OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
abiValidation {
enabled.set(true)
}

jvm {
tasks.named<Test>("jvmTest") {
useJUnitPlatform()
Expand All @@ -50,11 +51,6 @@ kotlin {
exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
}
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
freeCompilerArgs += listOf("-Xjvm-default=all")
}
}
}

linuxX64()
Expand All @@ -63,7 +59,6 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation(kotlin("stdlib-common"))
implementation(libs.ktx.coroutines.core)
implementation(libs.ktx.datetime)
implementation(libs.bundles.ktor)
Expand Down Expand Up @@ -121,24 +116,9 @@ tasks {
dependsOn("installKotlinterPrePushHook")
}

withType<Detekt>().configureEach {
jvmTarget = "11"

reports {
xml.required.set(true)
}
}

// https://youtrack.jetbrains.com/issue/KT-46466/Kotlin-MPP-publishing-Gradle-7-disables-optimizations-because-of-task-dependencies
val signingTasks = withType<Sign>()
withType<AbstractPublishToMaven>().configureEach {
dependsOn(signingTasks)
}
}

detekt {
buildUponDefaultConfig = true
allRules = false
config.setFrom(files("$projectDir/config/detekt.yml"))
baseline = file("$projectDir/config/baseline.xml")
}
6 changes: 0 additions & 6 deletions config/baseline.xml

This file was deleted.

284 changes: 0 additions & 284 deletions config/detekt.yml

This file was deleted.

2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kotlin.mpp.stability.nowarn=true
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.unsafe.configuration-cache=true
kotlin.mpp.enableCInteropCommonization=true
kotlin.mpp.applyDefaultHierarchyTemplate=false

POM_NAME=docker-kotlin
POM_DESCRIPTION=Docker Engine Remote API client
Expand Down
Loading
Loading