From 7f147283c12eb9b8d3a40cf134b69cfd7929bdeb Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Thu, 28 Mar 2019 20:04:57 +0700 Subject: [PATCH] CocoaPods sample: Add 32-bit arm --- .../cocoapods/ios-app/ios-app.xcodeproj/project.pbxproj | 6 ++++-- samples/cocoapods/kotlin-library/build.gradle.kts | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/samples/cocoapods/ios-app/ios-app.xcodeproj/project.pbxproj b/samples/cocoapods/ios-app/ios-app.xcodeproj/project.pbxproj index a26d413bfd4..fb3aa55d900 100644 --- a/samples/cocoapods/ios-app/ios-app.xcodeproj/project.pbxproj +++ b/samples/cocoapods/ios-app/ios-app.xcodeproj/project.pbxproj @@ -287,7 +287,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -342,7 +342,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -360,6 +360,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "ios-app/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -379,6 +380,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "ios-app/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/cocoapods/kotlin-library/build.gradle.kts b/samples/cocoapods/kotlin-library/build.gradle.kts index 9f98b1cee62..291c2faba00 100644 --- a/samples/cocoapods/kotlin-library/build.gradle.kts +++ b/samples/cocoapods/kotlin-library/build.gradle.kts @@ -14,9 +14,14 @@ version = "1.0" kotlin { // Add a platform switching to have an IDE support. - val buildForDevice = System.getenv("SDK_NAME")?.startsWith("iphoneos") ?: false + val buildForDevice = project.findProperty("kotlin.native.cocoapods.target") == "ios_arm" if (buildForDevice) { - iosArm64("iOS") + iosArm64("iOS64") + iosArm32("iOS32") + + val iOSMain by sourceSets.creating + sourceSets["iOS64Main"].dependsOn(iOSMain) + sourceSets["iOS32Main"].dependsOn(iOSMain) } else { iosX64("iOS") }