Skip to content

Commit d4d687f

Browse files
mmartosdevmmartosdev
committed
Fix compile time issues with iOS samples
1 parent 923699d commit d4d687f

File tree

15 files changed

+106
-421
lines changed

15 files changed

+106
-421
lines changed

‎demos/appyx-interactions/ios/build.gradle.kts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
plugins {
22
id("com.bumble.appyx.multiplatform")
33
kotlin("multiplatform")
4-
kotlin("native.cocoapods")
54
id("org.jetbrains.compose")
65
id("com.google.devtools.ksp")
76
}
87

98
kotlin {
10-
iosX64()
11-
iosArm64()
12-
iosSimulatorArm64()
13-
14-
cocoapods {
15-
version = "1.0.0"
16-
summary = "appyx-interactions ios module"
17-
homepage = "https://bumble-tech.github.io/appyx/interactions/"
18-
ios.deploymentTarget = "16.4"
19-
podfile = project.file("../iosApp/Podfile")
20-
framework {
9+
listOf(
10+
iosX64(),
11+
iosArm64(),
12+
iosSimulatorArm64()
13+
).forEach { iosTarget ->
14+
iosTarget.binaries.framework {
2115
baseName = "ios"
2216
isStatic = true
2317
}
24-
license = "Apache License, Version 2.0"
25-
authors = "https://github.com/bumble-tech/"
2618
}
2719

2820
sourceSets {

‎demos/appyx-interactions/ios/ios.podspec

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎demos/appyx-interactions/iosApp/Podfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎demos/appyx-interactions/iosApp/Podfile.lock

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎demos/appyx-interactions/iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 29 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,31 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
1111
058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
1212
2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
1313
7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
14-
CFDB58B53BB94DE262B13C24 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B1049432C0C2B312090ABF6 /* Pods_iosApp.framework */; };
1514
/* End PBXBuildFile section */
1615

1716
/* Begin PBXFileReference section */
1817
058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
1918
058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
2019
2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
21-
4FF3202A603A284706412EDC /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = "<group>"; };
22-
6B1049432C0C2B312090ABF6 /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
23-
7555FF7B242A565900829871 /* My application.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "My application.app"; sourceTree = BUILT_PRODUCTS_DIR; };
20+
7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
2421
7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
2522
7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2623
AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
27-
FF8CA3F5360CEAB49D74065F /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = "<group>"; };
2824
/* End PBXFileReference section */
2925

3026
/* Begin PBXFrameworksBuildPhase section */
31-
F85CB1118929364A9C6EFABC /* Frameworks */ = {
27+
B92378962B6B1156000C7307 /* Frameworks */ = {
3228
isa = PBXFrameworksBuildPhase;
3329
buildActionMask = 2147483647;
3430
files = (
35-
CFDB58B53BB94DE262B13C24 /* Pods_iosApp.framework in Frameworks */,
3631
);
3732
runOnlyForDeploymentPostprocessing = 0;
3833
};
@@ -50,7 +45,6 @@
5045
42799AB246E5F90AF97AA0EF /* Frameworks */ = {
5146
isa = PBXGroup;
5247
children = (
53-
6B1049432C0C2B312090ABF6 /* Pods_iosApp.framework */,
5448
);
5549
name = Frameworks;
5650
sourceTree = "<group>";
@@ -61,15 +55,14 @@
6155
AB1DB47929225F7C00F7AF9C /* Configuration */,
6256
7555FF7D242A565900829871 /* iosApp */,
6357
7555FF7C242A565900829871 /* Products */,
64-
FEFF387C0A8D172AA4D59CAE /* Pods */,
6558
42799AB246E5F90AF97AA0EF /* Frameworks */,
6659
);
6760
sourceTree = "<group>";
6861
};
6962
7555FF7C242A565900829871 /* Products */ = {
7063
isa = PBXGroup;
7164
children = (
72-
7555FF7B242A565900829871 /* My application.app */,
65+
7555FF7B242A565900829871 /* iosApp.app */,
7366
);
7467
name = Products;
7568
sourceTree = "<group>";
@@ -94,35 +87,27 @@
9487
path = Configuration;
9588
sourceTree = "<group>";
9689
};
97-
FEFF387C0A8D172AA4D59CAE /* Pods */ = {
98-
isa = PBXGroup;
99-
children = (
100-
4FF3202A603A284706412EDC /* Pods-iosApp.debug.xcconfig */,
101-
FF8CA3F5360CEAB49D74065F /* Pods-iosApp.release.xcconfig */,
102-
);
103-
path = Pods;
104-
sourceTree = "<group>";
105-
};
10690
/* End PBXGroup section */
10791

10892
/* Begin PBXNativeTarget section */
10993
7555FF7A242A565900829871 /* iosApp */ = {
11094
isa = PBXNativeTarget;
11195
buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */;
11296
buildPhases = (
113-
98D614C51D2DA07C614CC46E /* [CP] Check Pods Manifest.lock */,
97+
35B14F00C06EE2DB1E087410 /* [CP] Check Pods Manifest.lock */,
98+
F36B1CEB2AD83DDC00CB74D5 /* Compile Kotlin Framework */,
11499
7555FF77242A565900829871 /* Sources */,
100+
B92378962B6B1156000C7307 /* Frameworks */,
115101
7555FF79242A565900829871 /* Resources */,
116-
F85CB1118929364A9C6EFABC /* Frameworks */,
117-
DC181123632E88DCC8F3A89D /* [CP] Copy Pods Resources */,
102+
A525B2DD178C74CCE2E0B39B /* [CP] Copy Pods Resources */,
118103
);
119104
buildRules = (
120105
);
121106
dependencies = (
122107
);
123108
name = iosApp;
124109
productName = iosApp;
125-
productReference = 7555FF7B242A565900829871 /* My application.app */;
110+
productReference = 7555FF7B242A565900829871 /* iosApp.app */;
126111
productType = "com.apple.product-type.application";
127112
};
128113
/* End PBXNativeTarget section */
@@ -141,7 +126,7 @@
141126
};
142127
};
143128
buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */;
144-
compatibilityVersion = "Xcode 9.3";
129+
compatibilityVersion = "Xcode 12.0";
145130
developmentRegion = en;
146131
hasScannedForEncodings = 0;
147132
knownRegions = (
@@ -171,44 +156,23 @@
171156
/* End PBXResourcesBuildPhase section */
172157

173158
/* Begin PBXShellScriptBuildPhase section */
174-
98D614C51D2DA07C614CC46E /* [CP] Check Pods Manifest.lock */ = {
159+
F36B1CEB2AD83DDC00CB74D5 /* Compile Kotlin Framework */ = {
175160
isa = PBXShellScriptBuildPhase;
176161
buildActionMask = 2147483647;
177162
files = (
178163
);
179164
inputFileListPaths = (
180165
);
181166
inputPaths = (
182-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
183-
"${PODS_ROOT}/Manifest.lock",
184167
);
185-
name = "[CP] Check Pods Manifest.lock";
168+
name = "Compile Kotlin Framework";
186169
outputFileListPaths = (
187170
);
188171
outputPaths = (
189-
"$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt",
190-
);
191-
runOnlyForDeploymentPostprocessing = 0;
192-
shellPath = /bin/sh;
193-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
194-
showEnvVarsInLog = 0;
195-
};
196-
DC181123632E88DCC8F3A89D /* [CP] Copy Pods Resources */ = {
197-
isa = PBXShellScriptBuildPhase;
198-
buildActionMask = 2147483647;
199-
files = (
200-
);
201-
inputFileListPaths = (
202-
"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist",
203-
);
204-
name = "[CP] Copy Pods Resources";
205-
outputFileListPaths = (
206-
"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
207172
);
208173
runOnlyForDeploymentPostprocessing = 0;
209174
shellPath = /bin/sh;
210-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
211-
showEnvVarsInLog = 0;
175+
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 :demos:appyx-interactions:ios:embedAndSignAppleFrameworkForXcode\n";
212176
};
213177
/* End PBXShellScriptBuildPhase section */
214178

@@ -277,7 +241,7 @@
277241
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
278242
GCC_WARN_UNUSED_FUNCTION = YES;
279243
GCC_WARN_UNUSED_VARIABLE = YES;
280-
IPHONEOS_DEPLOYMENT_TARGET = 14.1;
244+
IPHONEOS_DEPLOYMENT_TARGET = 15.3;
281245
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
282246
MTL_FAST_MATH = YES;
283247
ONLY_ACTIVE_ARCH = YES;
@@ -333,7 +297,7 @@
333297
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
334298
GCC_WARN_UNUSED_FUNCTION = YES;
335299
GCC_WARN_UNUSED_VARIABLE = YES;
336-
IPHONEOS_DEPLOYMENT_TARGET = 14.1;
300+
IPHONEOS_DEPLOYMENT_TARGET = 15.3;
337301
MTL_ENABLE_DEBUG_INFO = NO;
338302
MTL_FAST_MATH = YES;
339303
SDKROOT = iphoneos;
@@ -345,20 +309,25 @@
345309
};
346310
7555FFA6242A565B00829871 /* Debug */ = {
347311
isa = XCBuildConfiguration;
348-
baseConfigurationReference = 4FF3202A603A284706412EDC /* Pods-iosApp.debug.xcconfig */;
349312
buildSettings = {
350313
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
351314
CODE_SIGN_IDENTITY = "Apple Development";
352315
CODE_SIGN_STYLE = Automatic;
353316
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
354317
DEVELOPMENT_TEAM = "${TEAM_ID}";
355318
ENABLE_PREVIEWS = YES;
319+
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../ios/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
356320
INFOPLIST_FILE = iosApp/Info.plist;
357-
IPHONEOS_DEPLOYMENT_TARGET = 14.1;
321+
IPHONEOS_DEPLOYMENT_TARGET = 15.3;
358322
LD_RUNPATH_SEARCH_PATHS = (
359323
"$(inherited)",
360324
"@executable_path/Frameworks",
361325
);
326+
OTHER_LDFLAGS = (
327+
"$(inherited)",
328+
"-framework",
329+
ios,
330+
);
362331
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}";
363332
PRODUCT_NAME = "${APP_NAME}";
364333
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -369,20 +338,25 @@
369338
};
370339
7555FFA7242A565B00829871 /* Release */ = {
371340
isa = XCBuildConfiguration;
372-
baseConfigurationReference = FF8CA3F5360CEAB49D74065F /* Pods-iosApp.release.xcconfig */;
373341
buildSettings = {
374342
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
375343
CODE_SIGN_IDENTITY = "Apple Development";
376344
CODE_SIGN_STYLE = Automatic;
377345
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
378346
DEVELOPMENT_TEAM = "${TEAM_ID}";
379347
ENABLE_PREVIEWS = YES;
348+
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../ios/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
380349
INFOPLIST_FILE = iosApp/Info.plist;
381-
IPHONEOS_DEPLOYMENT_TARGET = 14.1;
350+
IPHONEOS_DEPLOYMENT_TARGET = 15.3;
382351
LD_RUNPATH_SEARCH_PATHS = (
383352
"$(inherited)",
384353
"@executable_path/Frameworks",
385354
);
355+
OTHER_LDFLAGS = (
356+
"$(inherited)",
357+
"-framework",
358+
ios,
359+
);
386360
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}";
387361
PRODUCT_NAME = "${APP_NAME}";
388362
PROVISIONING_PROFILE_SPECIFIER = "";

‎demos/appyx-navigation/ios/build.gradle.kts

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
11
plugins {
22
id("com.bumble.appyx.multiplatform")
33
kotlin("multiplatform")
4-
kotlin("native.cocoapods")
54
id("org.jetbrains.compose")
65
id("com.google.devtools.ksp")
76
}
87

98
kotlin {
10-
11-
iosX64()
12-
iosArm64()
13-
iosSimulatorArm64()
14-
15-
cocoapods {
16-
version = "1.0.0"
17-
summary = "appyx-navigation iOS module"
18-
homepage = "https://bumble-tech.github.io/appyx/navigation/"
19-
ios.deploymentTarget = "17.0"
20-
podfile = project.file("../iosApp/Podfile")
21-
framework {
9+
listOf(
10+
iosX64(),
11+
iosArm64(),
12+
iosSimulatorArm64()
13+
).forEach { iosTarget ->
14+
iosTarget.binaries.framework {
2215
baseName = "ios"
2316
isStatic = true
2417
}
25-
license = "Apache License, Version 2.0"
26-
authors = "https://github.com/bumble-tech/"
2718
}
2819

2920
sourceSets {

0 commit comments

Comments
 (0)