Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update examples to build with Xcode 12.1 #10815

Merged
merged 1 commit into from Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/Specs.yml
Expand Up @@ -51,11 +51,11 @@ jobs:
- uses: maxim-lobanov/setup-xcode@v1.1
if: ${{ matrix.task == 'EXAMPLES' }}
with:
xcode-version: 11.3.1
xcode-version: 12.1

- name: Run Tests
run: bundle exec rake spec:all
env:
env:
COCOAPODS_CI_TASKS: ${{ matrix.task }}

on:
Expand All @@ -64,7 +64,7 @@ on:
- "master"
- "*-stable"
pull_request:
branches:
branches:
- master
- "*-stable"

Expand Up @@ -46,7 +46,6 @@
A8A706EB2A5031760E4C935B /* Pods-Vendored Framework Example.debug.xcconfig */,
57D9D0A9E402C4C20EF1132A /* Pods-Vendored Framework Example.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -131,6 +130,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -335,6 +335,7 @@
baseConfigurationReference = A8A706EB2A5031760E4C935B /* Pods-Vendored Framework Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
EXCLUDED_ARCHS = arm64;
Copy link
Contributor Author

@dnkoutso dnkoutso Jul 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this example we consume a vendored framework that does not ship this architecture. Excluding this arch is fine.

INFOPLIST_FILE = "Vendored Framework Example/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.Vendored-Framework-Example";
Expand All @@ -348,6 +349,7 @@
baseConfigurationReference = 57D9D0A9E402C4C20EF1132A /* Pods-Vendored Framework Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
EXCLUDED_ARCHS = arm64;
INFOPLIST_FILE = "Vendored Framework Example/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.Vendored-Framework-Example";
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Expand Up @@ -6,52 +6,52 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-i386_x86_64-simulator</string>
<string>tvos-arm64</string>
<key>LibraryPath</key>
<string>CoconutLib.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>i386</string>
<string>x86_64</string>
<string>arm64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>tvos</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>tvos-arm64</string>
<string>ios-arm64_armv7</string>
<key>LibraryPath</key>
<string>CoconutLib.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>tvos</string>
<string>ios</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-armv7_arm64</string>
<string>watchos-arm64_32_armv7k</string>
<key>LibraryPath</key>
<string>CoconutLib.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>armv7</string>
<string>arm64</string>
<string>arm64_32</string>
<string>armv7k</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<string>watchos</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>watchos-i386-simulator</string>
<string>watchos-arm64_i386_x86_64-simulator</string>
<key>LibraryPath</key>
<string>CoconutLib.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>watchos</string>
Expand All @@ -60,56 +60,60 @@
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>watchos-armv7k_arm64_32</string>
<string>ios-arm64_i386_x86_64-simulator</string>
<key>LibraryPath</key>
<string>CoconutLib.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>armv7k</string>
<string>arm64_32</string>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>watchos</string>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-x86_64-maccatalyst</string>
<string>tvos-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>CoconutLib.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<string>tvos</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
<string>simulator</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>tvos-x86_64-simulator</string>
<string>macos-x86_64</string>
<key>LibraryPath</key>
<string>CoconutLib.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>tvos</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
<string>macos</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>macos-x86_64</string>
<string>ios-x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>CoconutLib.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
@@ -0,0 +1,13 @@
BCSymbolMap Version: 2.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should these files be gitignored?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like they were not previously. What you see here is additions of new of these files due to new architectures since I rebuilt this framework using Xcode 12.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I think we use these to verify that the apps build with bitcode enabled but don't remember the specifics

Apple clang version 12.0.0 (clang-1200.0.32.21)
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.1.sdk
iPhoneOS14.1.sdk
/Users/dimitris/Library/Developer/Xcode/DerivedData/CoconutLib-emvxikeulksgclhknusminvzkhbs/Build/Intermediates.noindex/ArchiveIntermediates/CoconutLib-iOS/IntermediateBuildFilesPath/CoconutLib.build/Release-iphoneos/CoconutLib-iOS.build/DerivedSources/CoconutLib_vers.c
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the previous bcsymbolmaps had absolute paths as well.

/Users/dimitris/Development/ios/Rainforest/cocoapods/examples/Vendored XCFramework Example/CoconutLib
-[CoconutObj makeCoconuts]
__OBJC_METACLASS_RO_$_CoconutObj
__OBJC_$_INSTANCE_METHODS_CoconutObj
__OBJC_CLASS_RO_$_CoconutObj
/Users/dimitris/Development/ios/Rainforest/CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
/Users/dimitris/Development/ios/Rainforest
@@ -0,0 +1,13 @@
BCSymbolMap Version: 2.0
Apple clang version 12.0.0 (clang-1200.0.32.21)
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.1.sdk
iPhoneOS14.1.sdk
/Users/dimitris/Library/Developer/Xcode/DerivedData/CoconutLib-emvxikeulksgclhknusminvzkhbs/Build/Intermediates.noindex/ArchiveIntermediates/CoconutLib-iOS/IntermediateBuildFilesPath/CoconutLib.build/Release-iphoneos/CoconutLib-iOS.build/DerivedSources/CoconutLib_vers.c
/Users/dimitris/Development/ios/Rainforest/cocoapods/examples/Vendored XCFramework Example/CoconutLib
-[CoconutObj makeCoconuts]
__OBJC_METACLASS_RO_$_CoconutObj
__OBJC_$_INSTANCE_METHODS_CoconutObj
__OBJC_CLASS_RO_$_CoconutObj
/Users/dimitris/Development/ios/Rainforest/CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
/Users/dimitris/Development/ios/Rainforest
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,13 @@
BCSymbolMap Version: 2.0
Apple clang version 12.0.0 (clang-1200.0.32.21)
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.1.sdk
iPhoneSimulator14.1.sdk
/Users/dimitris/Library/Developer/Xcode/DerivedData/CoconutLib-emvxikeulksgclhknusminvzkhbs/Build/Intermediates.noindex/ArchiveIntermediates/CoconutLib-iOS/IntermediateBuildFilesPath/CoconutLib.build/Release-iphonesimulator/CoconutLib-iOS.build/DerivedSources/CoconutLib_vers.c
/Users/dimitris/Development/ios/Rainforest/cocoapods/examples/Vendored XCFramework Example/CoconutLib
-[CoconutObj makeCoconuts]
__OBJC_METACLASS_RO_$_CoconutObj
__OBJC_$_INSTANCE_METHODS_CoconutObj
__OBJC_CLASS_RO_$_CoconutObj
/Users/dimitris/Development/ios/Rainforest/CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
/Users/dimitris/Development/ios/Rainforest
Binary file not shown.
Binary file not shown.
Expand Up @@ -14,7 +14,7 @@
</data>
<key>Info.plist</key>
<data>
nJ4lsOJmWhUocku12wyjdjlaFb0=
H1fxpDJJMqEmmG9xwywH5EaVOiI=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19F101</string>
<string>20F71</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -27,17 +27,19 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>11E608c</string>
<string>12A7403</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<string>10.15.6</string>
<key>DTSDKBuild</key>
<string>19E258</string>
<string>19G68</string>
<key>DTSDKName</key>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1150</string>
<string>1210</string>
<key>DTXcodeBuild</key>
<string>11E608c</string>
<string>12A7403</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>
Expand Down
Binary file not shown.
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>19F101</string>
<string>20F71</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -27,17 +27,19 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>11E608c</string>
<string>12A7403</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<string>10.15.6</string>
<key>DTSDKBuild</key>
<string>19E258</string>
<string>19G68</string>
<key>DTSDKName</key>
<string>macosx10.15</string>
<key>DTXcode</key>
<string>1150</string>
<string>1210</string>
<key>DTXcodeBuild</key>
<string>11E608c</string>
<string>12A7403</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>
Expand Down
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/Info.plist</key>
<data>
oBoO8uB3SIODfSSkewinKOt/aVI=
5bTkoV0xqP5cxxA6vKFijPaMWhE=
</data>
</dict>
<key>files2</key>
Expand Down Expand Up @@ -36,7 +36,7 @@
<dict>
<key>hash2</key>
<data>
MVLRvuzMxcxhcEcnMh5yFmKF0zrcIYOuW7YbpFODhGg=
x+oqZFmE29rGi6UBGH+B3QoqtXYFlPsUB+dFXKZw6SM=
</data>
</dict>
</dict>
Expand Down

This file was deleted.

@@ -0,0 +1,13 @@
BCSymbolMap Version: 2.0
Apple clang version 12.0.0 (clang-1200.0.32.21)
/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS14.0.sdk
AppleTVOS14.0.sdk
/Users/dimitris/Library/Developer/Xcode/DerivedData/CoconutLib-emvxikeulksgclhknusminvzkhbs/Build/Intermediates.noindex/ArchiveIntermediates/CoconutLib-tvOS/IntermediateBuildFilesPath/CoconutLib.build/Release-appletvos/CoconutLib-tvOS.build/DerivedSources/CoconutLib_vers.c
/Users/dimitris/Development/ios/Rainforest/cocoapods/examples/Vendored XCFramework Example/CoconutLib
-[CoconutObj makeCoconuts]
__OBJC_METACLASS_RO_$_CoconutObj
__OBJC_$_INSTANCE_METHODS_CoconutObj
__OBJC_CLASS_RO_$_CoconutObj
/Users/dimitris/Development/ios/Rainforest/CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
/Users/dimitris/Development/ios/Rainforest
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,13 @@
BCSymbolMap Version: 2.0
Apple clang version 12.0.0 (clang-1200.0.32.21)
/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator14.0.sdk
AppleTVSimulator14.0.sdk
/Users/dimitris/Library/Developer/Xcode/DerivedData/CoconutLib-emvxikeulksgclhknusminvzkhbs/Build/Intermediates.noindex/ArchiveIntermediates/CoconutLib-tvOS/IntermediateBuildFilesPath/CoconutLib.build/Release-appletvsimulator/CoconutLib-tvOS.build/DerivedSources/CoconutLib_vers.c
/Users/dimitris/Development/ios/Rainforest/cocoapods/examples/Vendored XCFramework Example/CoconutLib
-[CoconutObj makeCoconuts]
__OBJC_METACLASS_RO_$_CoconutObj
__OBJC_$_INSTANCE_METHODS_CoconutObj
__OBJC_CLASS_RO_$_CoconutObj
/Users/dimitris/Development/ios/Rainforest/CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
CocoaPods/examples/Vendored XCFramework Example/CoconutLib/CoconutLib/Coconut.m
/Users/dimitris/Development/ios/Rainforest
Binary file not shown.
Binary file not shown.