Simplified gradle configurations (#154)

Author: Mr3zee

build.gradle.kts

@@ -3,15 +3,14 @@
  */
 
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
+import util.kotlinVersionParsed
 
 plugins {
-    alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.serialization) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.kotlinx.rpc) apply false
     alias(libs.plugins.atomicfu) apply false
-    alias(libs.plugins.detekt) apply false
-    alias(libs.plugins.kover.root.project) apply false
+    alias(libs.plugins.conventions.kover)
     alias(libs.plugins.binary.compatibility.validator)
 }
 
@@ -41,11 +40,7 @@ apiValidation {
     nonPublicMarkers.add(Const.INTERNAL_RPC_API_ANNOTATION)
 }
 
-val kotlinVersion: String by extra
-
-if (kotlinVersion >= "1.8.0") {
-    apply(plugin = libs.plugins.kover.root.project.get().pluginId)
-}
+val kotlinVersion: KotlinVersion by extra
 
 allprojects {
     group = "org.jetbrains.kotlinx"
@@ -57,8 +52,8 @@ println("kotlinx.rpc project version: $version, Kotlin version: $kotlinVersion")
 // If the prefix of the kPRC version is not Kotlin gradle plugin version - you have a problem :)
 // Probably some dependency brings kotlin with higher version.
 // To mitigate so, please refer to `gradle/kotlin-version-lookup.json`
-// and it's usage in `gradle-settings-conventions/src/main/kotlin/settings-conventions.settings.gradle.kts`
-val kotlinGPVersion = getKotlinPluginVersion()
+// and it's usage in `gradle-conventions-settings/src/main/kotlin/settings-conventions.settings.gradle.kts`
+val kotlinGPVersion = getKotlinPluginVersion().kotlinVersionParsed()
 if (kotlinVersion != kotlinGPVersion) {
     error("KGP version mismatch. Project version: $kotlinVersion, KGP version: $kotlinGPVersion")
 }

compiler-plugin/build.gradle.kts

@@ -4,11 +4,7 @@
 
 import util.configureMetaTasks
 
-plugins {
-    alias(libs.plugins.conventions.utils)
-}
-
-val kotlinVersion: String by extra
+val kotlinVersion: KotlinVersion by extra
 val rpcVersion: String = libs.versions.kotlinx.rpc.get()
 
 allprojects {

compiler-plugin/settings.gradle.kts

@@ -8,7 +8,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
     includeBuild("../gradle-conventions")
-    includeBuild("../gradle-settings-conventions")
+    includeBuild("../gradle-conventions-settings")
 }
 
 plugins {

core/src/commonMain/kotlin/kotlinx/rpc/internal/transport/RPCPluginKey.kt

@@ -21,7 +21,6 @@ import kotlinx.serialization.Serializable
  */
 @InternalRPCApi
 @Serializable(with = RPCPluginKeySerializer::class)
-@Suppress("detekt.MagicNumber")
 public enum class RPCPluginKey(override val uniqueIndex: Int, private val associatedPlugin: RPCPlugin): IndexedEnum {
     /**
      * Failed to decode key, possible due to different endpoint versions.

core/src/jsMain/kotlin/kotlinx/rpc/internal/WithRPCStubObject.js.kt

@@ -47,7 +47,6 @@ private val KClass<*>.jClass get(): JsClass<*> = asDynamic().jClass_1.unsafeCast
  *
  * This function uses std-lib's implementation and accounts for the bug in the compiler
  */
-@Suppress("detekt.ReturnCount")
 internal fun <T : Annotation, R : Any> KClass<*>.findAssociatedObjectImpl(
     annotationClass: KClass<T>,
     resultKClass: KClass<R>,

detekt/baseline.xml

@@ -5,7 +5,6 @@
 
 <SmellBaseline>
   <ManuallySuppressedIssues>
-    <ID>ReturnCount:ExceptionUtils.jvm.kt$@InternalRPCApi public actual fun SerializedException.deserialize(): Throwable</ID>
     <ID>CyclomaticComplexMethod:RPCServerService.kt$RPCServerService$@Suppress("detekt.ThrowsCount", "detekt.LongMethod") private fun handleCall(callData: RPCCallMessage.CallData)</ID>
     <ID>LongMethod:RPCServerService.kt$RPCServerService$@OptIn(InternalCoroutinesApi::class) private fun handleCall(callData: RPCCallMessage.CallData)</ID>
     <ID>RethrowCaughtException:KRPCTransportTestBase.kt$KRPCTransportTestBase$throw e</ID>

detekt/config.yaml

@@ -478,7 +478,7 @@ potential-bugs:
     active: true
   MissingPackageDeclaration:
     active: true
-    excludes: ['**/*.kts']
+    excludes: ['**/*.kts', '**/gradle-conventions-settings/**', '**/gradle-conventions/**']
   NullCheckOnMutableProperty:
     active: false
   NullableToStringCall:
@@ -616,7 +616,7 @@ style:
     active: true
     maxJumpCount: 3
   MagicNumber:
-    active: true
+    active: false
     excludes: ['**/*test*/**', '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**', '**/*.kts']
     ignoreNumbers:
       - '-1'
@@ -683,7 +683,7 @@ style:
     active: false
   ReturnCount:
     active: true
-    max: 2
+    max: 6
     excludedFunctions:
       - 'equals'
     excludeLabeled: false

gradle-conventions/conventions-utils/build.gradle.kts renamed to gradle-conventions-settings/build.gradle.kts

@@ -15,24 +15,17 @@ configurations.configureEach {
     }
 }
 
-val kotlinVersion: String by extra
+val kotlinVersion: KotlinVersion by extra
+val isLatestKotlinVersion: Boolean by extra
 
 dependencies {
     api(libs.kotlin.gradle.plugin)
     api(libs.detekt.gradle.plugin)
 
-    if (kotlinVersion >= "1.8.0") {
+    if (isLatestKotlinVersion) {
         api(libs.kover.gradle.plugin)
     }
 
     // https://stackoverflow.com/questions/76713758/use-version-catalog-inside-precompiled-gradle-plugin
     api(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
-
-gradlePlugin {
-    plugins {
-        named("conventions-utils") {
-            version = libs.versions.kotlinx.rpc.get()
-        }
-    }
-}

gradle-settings-conventions/settings.gradle.kts renamed to gradle-conventions-settings/settings.gradle.kts

@@ -2,7 +2,7 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-rootProject.name = "gradle-settings-conventions"
+rootProject.name = "gradle-conventions-settings"
 
 // Code below is a hack because a chicken-egg problem, I can't use myself as a settings-plugin
-apply(from="src/main/kotlin/settings-conventions.settings.gradle.kts")
+apply(from = "src/main/kotlin/settings-conventions.settings.gradle.kts")