Add klib validator. Set source and target jvm back to 8

prof18 · May 26, 2024 · 64fdd86 · 64fdd86
1 parent 30726fd
commit 64fdd86
Show file tree

Hide file tree

Showing 8 changed files with 256 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
+import kotlinx.validation.ExperimentalBCVApi
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 
 plugins {
@@ -20,6 +21,12 @@ apiValidation {
             "java"
         )
     )
+
+    @OptIn(ExperimentalBCVApi::class)
+    klib {
+        enabled = true
+        strictValidation = true
+    }
 }
 
 allprojects {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ library-version-name = "6.0.7"
 com-squareup-okhttp3 = "4.12.0"
 com-vanniktech-maven-publish="0.28.0"
 org-robolectric = "4.11.1"
-binary-compatibility-validator = "0.14.0"
+binary-compatibility-validator = "0.15.0-Beta.2"
 coroutines = "1.8.0"
 
 # Sample dependencies

diff --git a/renovate.json b/renovate.json
@@ -9,8 +9,7 @@
       "groupSlug": "kotlin",
       "matchPackageNames": [
         "org.jetbrains.kotlin",
-        "org.jetbrains.compose",
-        "androidx.compose.compiler"
+        "org.jetbrains.compose"
       ]
     }
   ]

diff --git a/rssparser/api/rssparser.klib.api b/rssparser/api/rssparser.klib.api
diff --git a/rssparser/build.gradle.kts b/rssparser/build.gradle.kts
@@ -1,27 +1,24 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
     alias(libs.plugins.com.vanniktech.maven.publish)
 }
 
-kotlin {
-    jvm {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "11"
-            }
-        }
+tasks.withType(KotlinJvmCompile::class).configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
     }
+}
+
+kotlin {
+    jvm()
 
     androidTarget {
         publishAllLibraryVariants()
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "11"
-            }
-        }
     }
 
     iosArm64()
@@ -115,7 +112,7 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
diff --git a/rssparser/src/commonTest/kotlin/com/prof18/rssparser/TestUtils.kt b/rssparser/src/commonTest/kotlin/com/prof18/rssparser/TestUtils.kt
@@ -2,7 +2,6 @@ package com.prof18.rssparser
 
 import com.prof18.rssparser.internal.ParserInput
 
-@Suppress("NO_ACTUAL_FOR_EXPECT")
 internal expect fun readFileFromResources(
     resourceName: String
 ): ParserInput
@@ -11,5 +10,4 @@ internal expect fun readFileFromResourcesAsString(
     resourceName: String
 ): String
 
-@Suppress("NO_ACTUAL_FOR_EXPECT")
 internal expect val currentTarget: CurrentTarget
diff --git a/rssparser/src/commonTest/kotlin/com/prof18/rssparser/XmlParserFactory.kt b/rssparser/src/commonTest/kotlin/com/prof18/rssparser/XmlParserFactory.kt
@@ -2,7 +2,6 @@ package com.prof18.rssparser
 
 import com.prof18.rssparser.internal.XmlParser
 
-@Suppress("NO_ACTUAL_FOR_EXPECT")
 internal expect object XmlParserFactory {
     fun createXmlParser(): XmlParser
 }
diff --git a/rssparser/src/commonTest/kotlin/com/prof18/rssparser/XmlParserTestExecutor.kt b/rssparser/src/commonTest/kotlin/com/prof18/rssparser/XmlParserTestExecutor.kt
@@ -1,4 +1,3 @@
 package com.prof18.rssparser
 
-@Suppress("NO_ACTUAL_FOR_EXPECT")
 expect abstract class XmlParserTestExecutor()