Merge pull request #563 from RedrockMobile/guoxiangrui/feature/update_libs

Guoxiangrui/feature/update libs

Author: 985892345

.idea/xcode.xml

@@ -15,7 +15,7 @@ object Config {
   const val versionName = "6.10.6-alpha" // 线上6.10.5，开发6.10.6-alpha，自己打包 -alpha，内测 -beta
 
   val composeDesktopVersion: String // compose desktop 只能是 x.y.z 形式，不能带 -
-    get() = versionName.substringBeforeLast("-")
+    get() = versionName.substringBefore("-")
 
   val releaseAbiFilters = listOf("arm64-v8a")
   val debugAbiFilters = listOf("arm64-v8a","x86_64")

build-logic/config/src/main/kotlin/Config.kt

@@ -1,9 +1,11 @@
 import com.g985892345.provider.plugin.gradle.extensions.KtProviderExtensions
 import com.google.devtools.ksp.gradle.KspExtension
+import de.jensklingenberg.ktorfit.gradle.KtorfitPluginExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.findByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 
@@ -22,10 +24,14 @@ fun Project.useKtProvider(isNeedKsp: Boolean = !name.startsWith("api")) {
     val ktProvider = extensions.getByName("ktProvider") as KtProviderExtensions
     kspMultiplatform(ktProvider.ksp)
   }
-  extensions.configure<KotlinMultiplatformExtension> {
+  // AGP9 后 application 插件不能与 multiplatform 共存
+  // 所以这里需要先判断 KotlinMultiplatformExtension 是否存在
+  extensions.findByType(KotlinMultiplatformExtension::class)?.apply {
     sourceSets.commonMain.dependencies {
       implementation(libsEx.`kmp-ktProvider-api`)
     }
+  } ?: dependencies {
+    "implementation"(libsEx.`kmp-ktProvider-api`)
   }
 }
 
@@ -90,19 +96,29 @@ fun Project.useNetwork() {
 }
 
 private fun Project.kspMultiplatform(dependencyNotation: Any) {
+  val isMultiplatform = extensions.findByType(KotlinMultiplatformExtension::class) != null
   dependencies {
-    "kspAndroid"(dependencyNotation)
-    if (Multiplatform.enableIOS(project)) {
-      "kspIosX64"(dependencyNotation)
-      "kspIosArm64"(dependencyNotation)
-      "kspIosSimulatorArm64"(dependencyNotation)
-    }
-    if (Multiplatform.enableWeb(project)) {
-      "kspJs"(dependencyNotation)
-      "kspWasmJs"(dependencyNotation)
-    }
-    if (Multiplatform.enableDesktop(project)) {
-      "kspDesktop"(dependencyNotation)
+    if (isMultiplatform) {
+      if (configurations.findByName("kspAndroid") != null) {
+        "kspAndroid"(dependencyNotation)
+      }
+      if (configurations.findByName("kspIosArm64") != null) {
+        "kspIosArm64"(dependencyNotation)
+      }
+      if (configurations.findByName("kspIosSimulatorArm64") != null) {
+        "kspIosSimulatorArm64"(dependencyNotation)
+      }
+      if (configurations.findByName("kspJs") != null) {
+        "kspJs"(dependencyNotation)
+      }
+      if (configurations.findByName("kspWasmJs") != null) {
+        "kspWasmJs"(dependencyNotation)
+      }
+      if (configurations.findByName("kspDesktop") != null) {
+        "kspDesktop"(dependencyNotation)
+      }
+    } else {
+      "ksp"(dependencyNotation)
     }
   }
 }

build-logic/manager/src/main/kotlin/UsePlugins.kt

@@ -1,11 +1,7 @@
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import rule.ModuleNamespaceCheckRule
 
 plugins {
   id("com.android.application")
-  id("kmp.base")
-  id("kmp.compose")
 }
 
 ProjectChecker.config(project) // 项目检查工具
@@ -77,51 +73,3 @@ android {
     buildConfig = true
   }
 }
-
-kotlin {
-  if (Multiplatform.enableIOS(project)) {
-    listOf(
-      iosX64(),
-      iosArm64(),
-      iosSimulatorArm64()
-    ).forEach { iosTarget ->
-      iosTarget.binaries.framework {
-        baseName = Config.getBaseName(project)
-        isStatic = true
-      }
-    }
-  }
-  if (Multiplatform.enableWeb(project)) {
-    js {
-      binaries.executable()
-    }
-
-    @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-      binaries.executable()
-    }
-  }
-}
-
-if (Multiplatform.enableDesktop(project)) {
-  compose.desktop {
-    application {
-      mainClass = "CyxbsDesktopAppKt"
-      nativeDistributions {
-        targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-        packageName = Config.getApplicationId(project)
-        packageVersion = Config.composeDesktopVersion
-      }
-      buildTypes {
-        release {
-          proguard {
-            isEnabled.set(true)
-            configurationFiles.from(rootDir.resolve("build-logic")
-              .resolve("manager")
-              .resolve("proguard-rules.pro"))
-          }
-        }
-      }
-    }
-  }
-}

…r/src/main/kotlin/manager.app.gradle.kts …in/kotlin/manager.app-android.gradle.ktsbuild-logic/manager/src/main/kotlin/manager.app.gradle.kts renamed to build-logic/manager/src/main/kotlin/manager.app-android.gradle.kts build-logic/manager/src/main/kotlin/manager.app.gradle.kts renamed to build-logic/manager/src/main/kotlin/manager.app-android.gradle.kts

@@ -0,0 +1,65 @@
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
+
+plugins {
+  id("kmp.compose")
+}
+
+if (Multiplatform.enableIOS(project)) {
+  kotlin {
+    listOf(
+      iosArm64(),
+      iosSimulatorArm64()
+    ).forEach { iosTarget ->
+      iosTarget.binaries.framework {
+        baseName = Config.getBaseName(project)
+        isStatic = true
+      }
+      // 导出部分项目代码让 iOS 进行引用
+      NativeBuildType.DEFAULT_BUILD_TYPES.forEach { type ->
+        iosTarget.binaries.getFramework(type).apply {
+          // 这里导出会导出很多东西，增加头文件体积，慎重选择导出的模块，能写在 pro iosMain 就尽量不导出
+//        export(projects.)
+        }
+      }
+    }
+  }
+}
+
+
+if (Multiplatform.enableWeb(project)) {
+  kotlin {
+    js {
+      binaries.executable()
+    }
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+      binaries.executable()
+    }
+  }
+}
+
+if (Multiplatform.enableDesktop(project)) {
+  compose.desktop {
+    application {
+      mainClass = "CyxbsDesktopAppKt"
+      nativeDistributions {
+        targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+        packageName = Config.getApplicationId(project)
+        packageVersion = Config.composeDesktopVersion
+      }
+      buildTypes {
+        release {
+          proguard {
+            isEnabled.set(true)
+            configurationFiles.from(rootDir.resolve("build-logic")
+              .resolve("manager")
+              .resolve("proguard-rules.pro"))
+          }
+        }
+      }
+    }
+  }
+}

build-logic/manager/src/main/kotlin/manager.app-multiplatform.gradle.kts

@@ -1,37 +1,37 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import rule.ModuleNamespaceCheckRule
 
 plugins {
-  id("com.android.library")
+  id("com.android.kotlin.multiplatform.library")
   id("kmp.base")
 }
 
 ProjectChecker.config(project) // 项目检查工具
 
-android {
-  namespace = ModuleNamespaceCheckRule.getCorrectNamespace(project)
-  compileSdk = libsEx.versions.`android-compileSdk`.toInt()
-  defaultConfig {
+kotlin {
+  android {
+    namespace = ModuleNamespaceCheckRule.getCorrectNamespace(project)
+    compileSdk = libsEx.versions.`android-compileSdk`.toInt()
     minSdk = libsEx.versions.`android-minSdk`.toInt()
-  }
-  compileOptions {
-    val javaVersion = libsEx.versions.javaTarget
-    sourceCompatibility = JavaVersion.toVersion(javaVersion)
-    targetCompatibility = JavaVersion.toVersion(javaVersion)
-  }
-  lint {
-    abortOnError = false // 编译遇到错误不退出，可以一次检查多个错误，并且已执行的 task 下次执行会直接走缓存
-    targetSdk = libsEx.versions.`android-targetSdk`.toInt()
-  }
-  // 命名规范设置，因为多模块相同资源名在打包时会合并，所以必须强制开启
-  val paths = project.path.split(":").drop(1)
-  if (paths.size == 1) {
-    resourcePrefix = project.name.substringAfter("_")
-  } else if (paths.first().contains("cyxbs-")) {
-    resourcePrefix = project.name
-  } else {
-    resourcePrefix = paths[paths.size - 2] + "_" + paths.last()
-  }
-  buildFeatures {
-    buildConfig = true
+    compilerOptions {
+      jvmTarget.set(JvmTarget.fromTarget(libsEx.versions.kotlinJvmTarget))
+    }
+    lint {
+      abortOnError = false // 编译遇到错误不退出，可以一次检查多个错误，并且已执行的 task 下次执行会直接走缓存
+      targetSdk = libsEx.versions.`android-targetSdk`.toInt()
+    }
+    androidResources {
+      // 是否启动资源取决于是否还存在 androidMain/res 文件
+      enable = project.projectDir.resolve("src").resolve("androidMain").resolve("res").exists()
+      // 命名规范设置，因为多模块相同资源名在打包时会合并，所以必须强制开启
+      val paths = project.path.split(":").drop(1)
+      if (paths.size == 1) {
+        resourcePrefix = project.name.substringAfter("_")
+      } else if (paths.first().contains("cyxbs-")) {
+        resourcePrefix = project.name
+      } else {
+        resourcePrefix = paths[paths.size - 2] + "_" + paths.last()
+      }
+    }
   }
 }

build-logic/manager/src/main/kotlin/manager.lib.gradle.kts

@@ -28,6 +28,9 @@ object ModuleNamespaceCheckRule : ProjectChecker.ICheckRule {
     if (project.name == "lib_common") {
       return // lib_common 未迁移，这里特殊处理，不进行检查
     }
+    if (project.path.contains("cyxbs-applications")) {
+      return // 跳过 cyxbs-applications，一般这里面不会新增模块
+    }
     val sourceSetList = listOf(
       "androidMain",
       "commonMain",

build-logic/plugin/checker/src/main/kotlin/rule/ModuleNamespaceCheckRule.kt

@@ -1,28 +1,20 @@
+import com.android.build.gradle.api.KotlinMultiplatformAndroidPlugin
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   kotlin("multiplatform")
   id(libsEx.plugins.kotlinSerialization)
-  id(libsEx.plugins.kotlinAtomicfu)
 }
 
 kotlin {
 
   compilerOptions {
-    optIn.add("kotlin.time.ExperimentalTime") // 抑制 ExperimentalTime 的警告
-  }
-
-  androidTarget {
-    compilerOptions {
-      jvmTarget.set(JvmTarget.fromTarget(libsEx.versions.kotlinJvmTarget))
-    }
+    optIn.add("kotlin.concurrent.atomics.ExperimentalAtomicApi") // 抑制 ExperimentalAtomicApi 的警告
   }
   if (Multiplatform.enableDesktop(project)) {
     jvm("desktop")
   }
   if (Multiplatform.enableIOS(project)) {
-    iosX64()
     iosArm64()
     iosSimulatorArm64()
   }
@@ -57,9 +49,11 @@ kotlin {
       // atomicfu 显示依赖解决 strictly 0.23.2 问题 https://github.com/Kotlin/kotlinx-atomicfu/issues/469
       implementation(libsEx.`kotlinx-atomicfu`)
     }
-    androidMain.dependencies {
-      implementation(libsEx.`kotlinx-coroutines-android`)
-      implementation(libsEx.`androidx-appcompat`)
+    if (plugins.hasPlugin(KotlinMultiplatformAndroidPlugin::class)) { // 需要确保先引入 android 插件
+      androidMain.dependencies {
+        implementation(libsEx.`kotlinx-coroutines-android`)
+        implementation(libsEx.`androidx-appcompat`)
+      }
     }
     // 桌面端
     if (Multiplatform.enableDesktop(project)) {
@@ -73,7 +67,6 @@ kotlin {
       val iosMain = create("iosMain") {
         dependsOn(commonMain.get())
       }
-      iosX64Main { dependsOn(iosMain) }
       iosArm64Main { dependsOn(iosMain) }
       iosSimulatorArm64Main { dependsOn(iosMain) }
     }
@@ -83,7 +76,9 @@ kotlin {
     val mobileMain = create("mobileMain") {
       dependsOn(commonMain.get())
     }
-    androidMain { dependsOn(mobileMain) }
+    if (plugins.hasPlugin(KotlinMultiplatformAndroidPlugin::class)) {
+      androidMain { dependsOn(mobileMain) }
+    }
     if (Multiplatform.enableIOS(project)) {
       val iosMain by getting {
         dependsOn(mobileMain)
@@ -103,7 +98,9 @@ kotlin {
     val noWebMain = create("noWebMain") {
       dependsOn(commonMain.get())
     }
-    androidMain { dependsOn(noWebMain) }
+    if (plugins.hasPlugin(KotlinMultiplatformAndroidPlugin::class)) {
+      androidMain { dependsOn(noWebMain) }
+    }
     if (Multiplatform.enableIOS(project)) {
       iosMain { dependsOn(noWebMain) }
     }