Refactor KMP iOS build #796
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
takahirom
commented
Aug 25, 2024
app-ios-shared/build.gradle.kts
Outdated
| (this.target.name == "iosSimulatorArm64" && this.debuggable) || (this.target.name == "iosArm64" && this.debuggable) | ||
| } else { | ||
| true | ||
| val includeToXCF = when (project.activeArch) { |
There was a problem hiding this comment.
This is the logic of activeArch
val Project.activeArch
get() = Arch.findByArch(
rootProject.layout.projectDirectory.file("local.properties").asFile.takeIf { it.exists() }
?.let {
Properties().apply {
load(it.reader(Charsets.UTF_8))
}.getProperty("arch")
} ?: System.getenv("arch") ?: properties["app.ios.shared.arch"] as? String
)
takahirom
commented
Aug 25, 2024
| @@ -171,7 +175,7 @@ | |||
| 8C7DACB72BCBCCB0002C298A /* Preview Assets.xcassets in Resources */, | |||
| 8C31F46B2BF6909A003F1BBA /* GoogleService-Info.plist in Resources */, | |||
| 8C7074772C7791BD00FD4F39 /* ci_post_clone.sh in Resources */, | |||
| 830BFA7C2C74EBF40017A600 /* compose-resources in Resources */, | |||
| 83CD07FE2C7B1F5400CDEFDB /* compose-resources in Resources */, | |||
There was a problem hiding this comment.
The current resource is like this
takahirom
commented
Aug 25, 2024
| @@ -194,7 +194,7 @@ | |||
| ); | |||
| runOnlyForDeploymentPostprocessing = 0; | |||
| shellPath = /bin/zsh; | |||
| shellScript = "cd ${SRCROOT}/../..\n\n./gradlew assembleSharedXCFramework --no-configuration-cache\n./gradlew iosSimulatorArm64AggregateResources --no-configuration-cache\n./gradlew iosArm64AggregateResources --no-configuration-cache\n\nSIMULATOR_RESOURCE_DIR=\"./app-ios-shared/build/kotlin-multiplatform-resources/aggregated-resources/iosSimulatorArm64\"\nDEVICE_RESOURCE_DIR=\"./app-ios-shared/build/kotlin-multiplatform-resources/aggregated-resources/iosArm64\"\n\nmkdir -p ${SIMULATOR_RESOURCE_DIR}/composeResources\nmkdir -p ${DEVICE_RESOURCE_DIR}/composeResources\n\nmkdir -p ${SIMULATOR_RESOURCE_DIR}/compose-resources\nmkdir -p ${DEVICE_RESOURCE_DIR}/compose-resources\n\ncp -R ${SIMULATOR_RESOURCE_DIR}/composeResources ${SIMULATOR_RESOURCE_DIR}/compose-resources\ncp -R ${DEVICE_RESOURCE_DIR}/composeResources ${DEVICE_RESOURCE_DIR}/compose-resources\n"; | |||
| shellScript = "cd ${SRCROOT}/../..\n\n./build_xcframework_with_xcode_environment_variable.sh\n./gradlew iosSimulatorArm64AggregateResources --no-configuration-cache\n./gradlew iosX64AggregateResources --no-configuration-cache\n\nARM_RESOURCE_DIR=\"./app-ios-shared/build/kotlin-multiplatform-resources/aggregated-resources/iosSimulatorArm64\"\nX64_RESOURCE_DIR=\"./app-ios-shared/build/kotlin-multiplatform-resources/aggregated-resources/iosX64\"\nRESOURCE_DIR=\"./app-ios-shared/build/kotlin-multiplatform-resources/aggregated-resources/compose-resources\"\n\nmkdir -p ${ARM_RESOURCE_DIR}/composeResources\nmkdir -p ${X64_RESOURCE_DIR}/composeResources\n\nmkdir -p ${RESOURCE_DIR}\n\ncp -R ${ARM_RESOURCE_DIR}/composeResources ${RESOURCE_DIR}\n\n# Check if X64 resources exist and are not empty\nif [ -d \"${X64_RESOURCE_DIR}/composeResources\" ] && [ \"$(ls -A \"${X64_RESOURCE_DIR}/composeResources\")\" ]; then\n # Copy X64 resources\n cp -R \"${X64_RESOURCE_DIR}/composeResources\" \"${RESOURCE_DIR}\"\nelse\n echo \"Warning: X64_RESOURCE_DIR is empty or does not exist. Skipping X64 resource copy.\"\nfi\n"; | |||
There was a problem hiding this comment.
The current script is like this
cd ${SRCROOT}/../..
./build_xcframework_with_xcode_environment_variable.sh
./gradlew iosSimulatorArm64AggregateResources --no-configuration-cache
./gradlew iosX64AggregateResources --no-configuration-cache
ARM_RESOURCE_DIR="./app-ios-shared/build/kotlin-multiplatform-resources/aggregated-resources/iosSimulatorArm64"
X64_RESOURCE_DIR="./app-ios-shared/build/kotlin-multiplatform-resources/aggregated-resources/iosX64"
RESOURCE_DIR="./app-ios-shared/build/kotlin-multiplatform-resources/aggregated-resources/compose-resources"
mkdir -p ${ARM_RESOURCE_DIR}/composeResources
mkdir -p ${X64_RESOURCE_DIR}/composeResources
mkdir -p ${RESOURCE_DIR}
cp -R ${ARM_RESOURCE_DIR}/composeResources ${RESOURCE_DIR}
# Check if X64 resources exist and are not empty
if [ -d "${X64_RESOURCE_DIR}/composeResources" ] && [ "$(ls -A "${X64_RESOURCE_DIR}/composeResources")" ]; then
# Copy X64 resources
cp -R "${X64_RESOURCE_DIR}/composeResources" "${RESOURCE_DIR}"
else
echo "Warning: X64_RESOURCE_DIR is empty or does not exist. Skipping X64 resource copy."
fi
takahirom
commented
Aug 25, 2024
| @@ -14,8 +14,13 @@ build-kmp-module: | |||
| cd .. && \ | |||
| ./gradlew app-ios-shared:assembleSharedXCFramework --no-configuration-cache | |||
There was a problem hiding this comment.
Now build-kmp-module build all architectures.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
Overview (Required)
app.ios.shared.debugto achieve Single source of truth.Links
Screenshot (Optional if screenshot test is present or unrelated to UI)
Movie (Optional)