Add klib api validation

.github/workflows/CI.yml

@@ -11,6 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ macos-latest, ubuntu-latest, windows-latest ]
+        java-version: [ 11, 19 ]
 
     runs-on: ${{ matrix.os }}
 
@@ -46,20 +47,39 @@ jobs:
         uses: actions/[email protected]
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: ${{ matrix.java-version }}
+
+      - name: Check API Compatibility
+        if: matrix.os == 'macos-latest' && matrix.java-version == 19
+        run: >
+          ./gradlew apiCheck --stacktrace
 
       - name: Run macOS Tests
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-latest' && matrix.java-version == 19
+        run: >
+          ./gradlew check --stacktrace
+          -PKMP_TARGETS="JVM,IOS_ARM64,IOS_X64,IOS_SIMULATOR_ARM64,MACOS_ARM64,MACOS_X64,TVOS_ARM64,TVOS_X64,TVOS_SIMULATOR_ARM64,WATCHOS_ARM32,WATCHOS_ARM64,WATCHOS_DEVICE_ARM64,WATCHOS_X64,WATCHOS_SIMULATOR_ARM64"
+
+      - name: Run macOS Java11 Tests
+        if: matrix.os == 'macos-latest' && matrix.java-version == 11
         run: >
           ./gradlew check --stacktrace
-          -PKMP_TARGETS="JVM,JS,IOS_ARM64,IOS_X64,IOS_SIMULATOR_ARM64,MACOS_ARM64,MACOS_X64,TVOS_ARM64,TVOS_X64,TVOS_SIMULATOR_ARM64,WATCHOS_ARM32,WATCHOS_ARM64,WATCHOS_DEVICE_ARM64,WATCHOS_X64,WATCHOS_SIMULATOR_ARM64,WASM_JS,WASM_WASI"
+          -PKMP_TARGETS="JS,JVM,WASM_JS,WASM_WASI"
+
       - name: Run Linux Tests
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-latest' && matrix.java-version == 19
         run: >
           ./gradlew check --stacktrace
-          -PKMP_TARGETS="JVM,JS,ANDROID_ARM32,ANDROID_ARM64,ANDROID_X64,ANDROID_X86,LINUX_ARM64,LINUX_X64,WASM_JS,WASM_WASI"
+          -PKMP_TARGETS="ANDROID,ANDROID_ARM32,ANDROID_ARM64,ANDROID_X64,ANDROID_X86,JVM,LINUX_ARM64,LINUX_X64"
+
+      - name: Run Linux Java11 Tests
+        if: matrix.os == 'ubuntu-latest' && matrix.java-version == 11
+        run: >
+          ./gradlew check --stacktrace
+          -PKMP_TARGETS="JS,JVM,WASM_JS,WASM_WASI"
+
       - name: Run Windows Tests
-        if: matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-latest' && matrix.java-version == 11
         run: >
           ./gradlew check --stacktrace
           -PKMP_TARGETS="JVM,JS,MINGW_X64,WASM_JS,WASM_WASI"

build-logic/build.gradle.kts

@@ -18,7 +18,6 @@ plugins {
 }
 
 dependencies {
-    implementation(libs.gradle.android)
     implementation(libs.gradle.kmp.configuration)
     implementation(libs.gradle.kotlin)
     implementation(libs.gradle.publish.maven)

build-logic/settings.gradle.kts

@@ -20,7 +20,6 @@ rootProject.name = "build-logic"
 dependencyResolutionManagement {
     repositories {
         mavenCentral()
-        google()
         gradlePluginPortal()
     }
 

build-logic/src/main/kotlin/-KmpConfigurationExtension.kt

@@ -13,20 +13,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+import io.matthewnelson.kmp.configuration.ExperimentalKmpConfigurationApi
 import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
 import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
 import org.gradle.api.Action
 import org.gradle.api.JavaVersion
 
 fun KmpConfigurationExtension.configureShared(
+    java9ModuleName: String? = null,
     publish: Boolean = false,
     action: Action<KmpConfigurationContainerDsl>,
 ) {
+    if (publish) {
+        require(!java9ModuleName.isNullOrBlank()) { "publications must specify a module-info name" }
+    }
+
     configure {
+        options {
+            useUniqueModuleNames = true
+        }
+
         jvm {
             kotlinJvmTarget = JavaVersion.VERSION_1_8
             compileSourceCompatibility = JavaVersion.VERSION_1_8
             compileTargetCompatibility = JavaVersion.VERSION_1_8
+
+            @OptIn(ExperimentalKmpConfigurationApi::class)
+            java9ModuleInfoName = java9ModuleName
         }
 
         js {
@@ -57,7 +70,7 @@ fun KmpConfigurationExtension.configureShared(
             }
         }
 
-        kotlin { explicitApi() }
+        if (publish) kotlin { explicitApi() }
 
         action.execute(this)
     }

build.gradle.kts

@@ -24,21 +24,17 @@ plugins {
 }
 
 allprojects {
-
     findProperty("GROUP")?.let { group = it }
     findProperty("VERSION_NAME")?.let { version = it }
     findProperty("POM_DESCRIPTION")?.let { description = it.toString() }
 
     repositories {
         mavenCentral()
-        google()
-        gradlePluginPortal()
     }
-
 }
 
 @Suppress("PropertyName")
-val CHECK_PUBLICATION = findProperty("CHECK_PUBLICATION") as? String
+val CHECK_PUBLICATION = findProperty("CHECK_PUBLICATION")
 
 plugins.withType<YarnPlugin> {
     the<YarnRootExtension>().lockFileDirectory = rootDir.resolve(".kotlin-js-store")
@@ -48,6 +44,11 @@ plugins.withType<YarnPlugin> {
 }
 
 apiValidation {
+    // Only enable when selectively enabled targets are not being passed via cli.
+    // See https://github.com/Kotlin/binary-compatibility-validator/issues/269
+    @OptIn(kotlinx.validation.ExperimentalBCVApi::class)
+    klib.enabled = findProperty("KMP_TARGETS") == null
+
     if (CHECK_PUBLICATION != null) {
         ignoredProjects.add("check-publication")
     }

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ androidx-test-core = "1.5.0"
 androidx-test-runner = "1.5.2"
 
 gradle-android = "8.2.2"
-gradle-binary-compat = "0.14.0"
+gradle-binary-compat = "0.16.3"
 gradle-kmp-configuration = "0.3.2"
 gradle-kotlin = "1.9.24"
 gradle-publish-maven = "0.29.0"

library/file-test-android/build.gradle.kts

@@ -17,6 +17,10 @@ plugins {
     id("configuration")
 }
 
+repositories {
+    google()
+}
+
 kmpConfiguration {
     configure {
         androidLibrary {