Move explicit API mode enabling to build-logic

ktorio · Dec 27, 2024 · 3444354 · 3444354
1 parent 9927db4
commit 3444354
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 13 deletions.
diff --git a/build-logic/src/main/kotlin/ktorbuild.kmp.gradle.kts b/build-logic/src/main/kotlin/ktorbuild.kmp.gradle.kts
@@ -16,6 +16,8 @@ plugins {
 }
 
 kotlin {
+    explicitApi()
+
     compilerOptions {
         progressiveMode = true
         apiVersion = ktorBuild.kotlinApiVersion

diff --git a/build-logic/src/main/kotlin/ktorbuild.project.internal.gradle.kts b/build-logic/src/main/kotlin/ktorbuild.project.internal.gradle.kts
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("ktorbuild.kmp")
+}
+
+kotlin {
+    // Disable explicit API by default for internal projects
+    explicitApi = null
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,15 +25,6 @@ extra["nonDefaultProjectStructure"] = mutableListOf(
     "ktor-java-modules-test",
 )
 
-val disabledExplicitApiModeProjects = listOf(
-    "ktor-client-tests",
-    "ktor-server-test-base",
-    "ktor-server-test-suites",
-    "ktor-server-tests",
-    "ktor-client-content-negotiation-tests",
-    "ktor-test-base"
-)
-
 apply(from = "gradle/compatibility.gradle")
 
 plugins {
@@ -58,10 +49,6 @@ subprojects {
     apply(plugin = "ktorbuild.kmp")
     apply(plugin = "atomicfu-conventions")
 
-    kotlin {
-        if (!disabledExplicitApiModeProjects.contains(project.name)) explicitApi()
-    }
-
     val skipPublish: List<String> by rootProject.extra
     if (!skipPublish.contains(project.name)) {
         configurePublication()

diff --git a/...ns/ktor-client-content-negotiation/ktor-client-content-negotiation-tests/build.gradle.kts b/...ns/ktor-client-content-negotiation/ktor-client-content-negotiation-tests/build.gradle.kts
@@ -5,6 +5,7 @@
 description = "Common tests for client content negotiation"
 
 plugins {
+    id("ktorbuild.project.internal")
     id("kotlinx-serialization")
 }
 

diff --git a/ktor-client/ktor-client-tests/build.gradle.kts b/ktor-client/ktor-client-tests/build.gradle.kts
@@ -5,6 +5,7 @@
 description = "Common tests for client"
 
 plugins {
+    id("ktorbuild.project.internal")
     id("kotlinx-serialization")
     id("test-server")
 }

diff --git a/ktor-server/ktor-server-test-base/build.gradle.kts b/ktor-server/ktor-server-test-base/build.gradle.kts
@@ -4,6 +4,10 @@
 
 description = ""
 
+plugins {
+    id("ktorbuild.project.internal")
+}
+
 kotlin.sourceSets {
     commonMain {
         dependencies {

diff --git a/ktor-server/ktor-server-test-suites/build.gradle.kts b/ktor-server/ktor-server-test-suites/build.gradle.kts
@@ -4,6 +4,10 @@
 
 description = ""
 
+plugins {
+    id("ktorbuild.project.internal")
+}
+
 kotlin.sourceSets {
     commonMain {
         dependencies {

diff --git a/ktor-server/ktor-server-tests/build.gradle.kts b/ktor-server/ktor-server-tests/build.gradle.kts
@@ -5,6 +5,7 @@
 description = ""
 
 plugins {
+    id("ktorbuild.project.internal")
     id("kotlinx-serialization")
 }
 

diff --git a/ktor-shared/ktor-test-base/build.gradle.kts b/ktor-shared/ktor-test-base/build.gradle.kts
@@ -4,6 +4,10 @@
 
 description = "Common extensions for testing Ktor"
 
+plugins {
+    id("ktorbuild.project.internal")
+}
+
 kotlin.sourceSets {
     commonMain {
         dependencies {