Prefer explicitApi() instead of hand coded version

Author: rlazo

firebase-ai/firebase-ai.gradle.kts

@@ -17,7 +17,6 @@
 @file:Suppress("UnstableApiUsage")
 
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("firebase-library")
@@ -73,18 +72,9 @@ android {
   }
 }
 
-kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }
-
-// Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any
-// classes, methods, or properties have implicit `public` visibility. This check helps
-// avoid  accidentally leaking elements into the public API, requiring that any public
-// element be explicitly declared as `public`.
-// https://github.com/Kotlin/KEEP/blob/master/proposals/explicit-api-mode.md
-// https://chao2zhang.medium.com/explicit-api-mode-for-kotlin-on-android-b8264fdd76d1
-tasks.withType<KotlinJvmCompile>().configureEach {
-  if (!name.contains("test", ignoreCase = true)) {
-    compilerOptions.freeCompilerArgs.add("-Xexplicit-api=strict")
-  }
+kotlin {
+  compilerOptions { jvmTarget = JvmTarget.JVM_1_8 }
+  explicitApi()
 }
 
 dependencies {

firebase-dataconnect/connectors/connectors.gradle.kts

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("com.android.library")
@@ -70,6 +68,7 @@ kotlin {
     jvmTarget = JvmTarget.JVM_1_8
     optIn.add("kotlin.RequiresOptIn")
   }
+  explicitApi()
 }
 
 dependencies {
@@ -100,15 +99,3 @@ dependencies {
   androidTestImplementation(libs.truth.liteproto.extension)
   androidTestImplementation(libs.turbine)
 }
-
-// Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any
-// classes, methods, or properties have implicit `public` visibility. This check helps
-// avoid  accidentally leaking elements into the public API, requiring that any public
-// element be explicitly declared as `public`.
-// https://github.com/Kotlin/KEEP/blob/master/proposals/explicit-api-mode.md
-// https://chao2zhang.medium.com/explicit-api-mode-for-kotlin-on-android-b8264fdd76d1
-tasks.withType<KotlinJvmCompile>().configureEach {
-  if (!name.contains("test", ignoreCase = true)) {
-    compilerOptions.freeCompilerArgs.add("-Xexplicit-api=strict")
-  }
-}

firebase-dataconnect/firebase-dataconnect.gradle.kts

@@ -16,9 +16,7 @@
 
 import com.google.firebase.dataconnect.gradle.plugin.DataConnectExecutableVersionsRegistry
 import com.google.firebase.dataconnect.gradle.plugin.UpdateDataConnectExecutableVersionsTask
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("firebase-library")
@@ -81,6 +79,7 @@ kotlin {
     jvmTarget = JvmTarget.JVM_1_8
     optIn.add("kotlin.RequiresOptIn")
   }
+  explicitApi()
 }
 
 protobuf {
@@ -155,18 +154,6 @@ dependencies {
   androidTestImplementation(libs.turbine)
 }
 
-// Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any
-// classes, methods, or properties have implicit `public` visibility. This check helps
-// avoid  accidentally leaking elements into the public API, requiring that any public
-// element be explicitly declared as `public`.
-// https://github.com/Kotlin/KEEP/blob/master/proposals/explicit-api-mode.md
-// https://chao2zhang.medium.com/explicit-api-mode-for-kotlin-on-android-b8264fdd76d1
-tasks.withType<KotlinJvmCompile>().configureEach {
-  if (!name.contains("test", ignoreCase = true)) {
-    compilerOptions.freeCompilerArgs.add("-Xexplicit-api=strict")
-  }
-}
-
 // Registers a Gradle task that updates the JSON file that stores the list of Data Connect
 // executable versions. The task gets the list of all versions from the Internet and then
 // updates the JSON file with their sizes and hashes.

firebase-functions/firebase-functions.gradle.kts

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
   id("firebase-library")
@@ -57,19 +56,8 @@ android {
   lint { targetSdk = targetSdkVersion }
 }
 
-kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } }
+kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_1_8 }   explicitApi()}
 
-// Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any
-// classes, methods, or properties have implicit `public` visibility. This check helps
-// avoid  accidentally leaking elements into the public API, requiring that any public
-// element be explicitly declared as `public`.
-// https://github.com/Kotlin/KEEP/blob/master/proposals/explicit-api-mode.md
-// https://chao2zhang.medium.com/explicit-api-mode-for-kotlin-on-android-b8264fdd76d1
-tasks.withType<KotlinJvmCompile>().configureEach {
-  if (!name.contains("test", ignoreCase = true)) {
-    compilerOptions.freeCompilerArgs.add("-Xexplicit-api=strict")
-  }
-}
 
 dependencies {
   javadocClasspath("org.codehaus.mojo:animal-sniffer-annotations:1.21")

firebase-sessions/firebase-sessions.gradle.kts

@@ -61,9 +61,9 @@ android {
   }
 }
 
-kotlin { 
+kotlin {
   explicitApi()
-  compilerOptions { jvmTarget = JvmTarget.JVM_1_8 } 
+  compilerOptions { jvmTarget = JvmTarget.JVM_1_8 }
 }
 
 dependencies {