Skip to content

Commit 58f3712

Browse files
authored
Update to Kolin 2.0 (#202)
1 parent 1d2fb3d commit 58f3712

File tree

6 files changed

+11
-327
lines changed

6 files changed

+11
-327
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ jobs:
5050
uses: gradle/actions/setup-gradle@v4
5151

5252
- name: Check Binary Compatibility
53-
run: ./gradlew apiCheck
53+
run: ./gradlew checkLegacyAbi

build.gradle.kts

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
import io.gitlab.arturbosch.detekt.Detekt
21
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
32

43
plugins {
54
alias(libs.plugins.kotlin.multiplatform)
65
alias(libs.plugins.kotlinx.serialization)
76
alias(libs.plugins.kotlinter)
87
alias(libs.plugins.publish)
9-
alias(libs.plugins.binaryCompatibilityValidator)
10-
alias(libs.plugins.kover)
11-
alias(libs.plugins.detekt)
128
}
139

1410
group = "me.devnatan"
@@ -37,6 +33,11 @@ repositories {
3733
kotlin {
3834
explicitApi()
3935

36+
@OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
37+
abiValidation {
38+
enabled.set(true)
39+
}
40+
4041
jvm {
4142
tasks.named<Test>("jvmTest") {
4243
useJUnitPlatform()
@@ -50,11 +51,6 @@ kotlin {
5051
exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
5152
}
5253
}
53-
tasks.withType<KotlinCompile>().configureEach {
54-
kotlinOptions {
55-
freeCompilerArgs += listOf("-Xjvm-default=all")
56-
}
57-
}
5854
}
5955

6056
linuxX64()
@@ -63,7 +59,6 @@ kotlin {
6359
sourceSets {
6460
val commonMain by getting {
6561
dependencies {
66-
implementation(kotlin("stdlib-common"))
6762
implementation(libs.ktx.coroutines.core)
6863
implementation(libs.ktx.datetime)
6964
implementation(libs.bundles.ktor)
@@ -121,24 +116,9 @@ tasks {
121116
dependsOn("installKotlinterPrePushHook")
122117
}
123118

124-
withType<Detekt>().configureEach {
125-
jvmTarget = "11"
126-
127-
reports {
128-
xml.required.set(true)
129-
}
130-
}
131-
132119
// https://youtrack.jetbrains.com/issue/KT-46466/Kotlin-MPP-publishing-Gradle-7-disables-optimizations-because-of-task-dependencies
133120
val signingTasks = withType<Sign>()
134121
withType<AbstractPublishToMaven>().configureEach {
135122
dependsOn(signingTasks)
136123
}
137124
}
138-
139-
detekt {
140-
buildUponDefaultConfig = true
141-
allRules = false
142-
config.setFrom(files("$projectDir/config/detekt.yml"))
143-
baseline = file("$projectDir/config/baseline.xml")
144-
}

config/baseline.xml

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

config/detekt.yml

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

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kotlin.mpp.stability.nowarn=true
44
org.gradle.caching=true
55
org.gradle.parallel=true
66
org.gradle.unsafe.configuration-cache=true
7-
kotlin.mpp.enableCInteropCommonization=true
7+
kotlin.mpp.applyDefaultHierarchyTemplate=false
88

99
POM_NAME=docker-kotlin
1010
POM_DESCRIPTION=Docker Engine Remote API client

0 commit comments

Comments
 (0)