代码整理

composeApp/build.gradle.kts

@@ -6,11 +6,9 @@ plugins {
 }
 
 kotlin {
-    androidTarget {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_11)
-        }
-    }
+    // 让 Kotlin 使用 JDK 17 运行编译任务
+    jvmToolchain(17)
+    androidTarget()
 
     ohosArm64 {
         binaries {

composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml

-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="450dp"
-    android:height="450dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-  <path
-      android:pathData="M56.25,18V46L32,60 7.75,46V18L32,4Z"
-      android:fillColor="#6075f2"/>
-  <path
-      android:pathData="m41.5,26.5v11L32,43V60L56.25,46V18Z"
-      android:fillColor="#6b57ff"/>
-  <path
-      android:pathData="m32,43 l-9.5,-5.5v-11L7.75,18V46L32,60Z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:centerX="23.131"
-          android:centerY="18.441"
-          android:gradientRadius="42.132"
-          android:type="radial">
-        <item android:offset="0" android:color="#FF5383EC"/>
-        <item android:offset="0.867" android:color="#FF7F52FF"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="M22.5,26.5 L32,21 41.5,26.5 56.25,18 32,4 7.75,18Z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:startX="44.172"
-          android:startY="4.377"
-          android:endX="17.973"
-          android:endY="34.035"
-          android:type="linear">
-        <item android:offset="0" android:color="#FF33C3FF"/>
-        <item android:offset="0.878" android:color="#FF5383EC"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:pathData="m32,21 l9.526,5.5v11L32,43 22.474,37.5v-11z"
-      android:fillColor="#000000"/>
-</vector>
\ No newline at end of file

gradle.properties

@@ -11,6 +11,6 @@ org.gradle.caching=true
 android.nonTransitiveRClass=true
 android.useAndroidX=true
 
-org.gradle.java.home=/Users/jiangyuhuan/zulu-17.jdk/Contents/Home
+# org.gradle.java.home=/Users/jiangyuhuan/zulu-17.jdk/Contents/Home
 # kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 kotlin.mpp.applyDefaultHierarchyTemplate=false
\ No newline at end of file

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -35,7 +35,7 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet section */
-		C389BBDB2EFD167A007581B7 /* Exceptions for "iosApp" folder in "Embed Frameworks" phase from "iosApp" target */ = {
+		C389BBE52EFD5615007581B7 /* Exceptions for "iosApp" folder in "Embed Frameworks" phase from "iosApp" target */ = {
 			isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet;
 			attributesByRelativePath = {
 				ComposeApp.framework = (CodeSignOnCopy, RemoveHeadersOnCopy, );
@@ -57,7 +57,7 @@
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
 				BDD43DEBB46AE8B613E12CE8 /* Exceptions for "iosApp" folder in "iosApp" target */,
-				C389BBDB2EFD167A007581B7 /* Exceptions for "iosApp" folder in "Embed Frameworks" phase from "iosApp" target */,
+				C389BBE52EFD5615007581B7 /* Exceptions for "iosApp" folder in "Embed Frameworks" phase from "iosApp" target */,
 			);
 			path = iosApp;
 			sourceTree = "<group>";

iosApp/iosApp/ComposeApp.framework/Headers/ComposeApp.h

@@ -181,6 +181,7 @@ __attribute__((objc_subclassing_restricted))
 __attribute__((swift_name("App_iosKt")))
 @interface ComposeAppApp_iosKt : ComposeAppBase
 + (NSString *)appInfoForIos __attribute__((swift_name("appInfoForIos()")));
++ (NSString *)iosUiText __attribute__((swift_name("iosUiText()")));
 @end
 
 __attribute__((objc_subclassing_restricted))

lib-arith/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
 }
 
 kotlin {
+    // 统一使用 JDK 17 作为工具链
+    jvmToolchain(17)
     androidTarget()
     iosArm64()
     iosSimulatorArm64()