Skip to content

Commit 948b5e3

Browse files
committed
Enable Kotlin MPP cinterop commonization and refine Xcode build script handling
- Enable `kotlin.mpp.enableCInteropCommonization` in `gradle.properties`. - Update Xcode build script to respect `OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED` environment variable, allowing skip of Gradle build invocation.
1 parent 81bec8e commit 948b5e3

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#Kotlin
22
kotlin.code.style=official
33
kotlin.daemon.jvmargs=-Xmx3072M
4+
kotlin.mpp.enableCInteropCommonization=true
45
#Gradle
56
org.gradle.jvmargs=-Xmx3072M -Dfile.encoding=UTF-8
67
org.gradle.configuration-cache=true

iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
);
179179
runOnlyForDeploymentPostprocessing = 0;
180180
shellPath = /bin/sh;
181-
shellScript = "cd \"$SRCROOT/..\"\n./gradlew :demo-shared:embedAndSignAppleFrameworkForXcode";
181+
shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :demo-shared:embedAndSignAppleFrameworkForXcode";
182182
};
183183
/* End PBXShellScriptBuildPhase section */
184184

@@ -324,7 +324,7 @@
324324
ENABLE_PREVIEWS = YES;
325325
FRAMEWORK_SEARCH_PATHS = (
326326
"$(inherited)",
327-
"$(SRCROOT)/../demo-shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
327+
"$(SRCROOT)/../demo-shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
328328
);
329329
INFOPLIST_FILE = iosApp/Info.plist;
330330
IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -335,7 +335,7 @@
335335
OTHER_LDFLAGS = (
336336
"$(inherited)",
337337
"-framework",
338-
demoShared,
338+
demoShared,
339339
);
340340
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}";
341341
PRODUCT_NAME = "${APP_NAME}";
@@ -356,7 +356,7 @@
356356
ENABLE_PREVIEWS = YES;
357357
FRAMEWORK_SEARCH_PATHS = (
358358
"$(inherited)",
359-
"$(SRCROOT)/../demo-shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
359+
"$(SRCROOT)/../demo-shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
360360
);
361361
INFOPLIST_FILE = iosApp/Info.plist;
362362
IPHONEOS_DEPLOYMENT_TARGET = 14.1;
@@ -367,7 +367,7 @@
367367
OTHER_LDFLAGS = (
368368
"$(inherited)",
369369
"-framework",
370-
demoShared,
370+
demoShared,
371371
);
372372
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}";
373373
PRODUCT_NAME = "${APP_NAME}";

0 commit comments

Comments
 (0)