Skip to content

Commit

Permalink
Merge branch '1-10-stable' into merge1100final_into_master
Browse files Browse the repository at this point in the history
* 1-10-stable:
  [CHANGELOG] Add empty Master section
  Release 1.10.0
  Bump Xcodeproj to 1.19
  Update project config to be more compatible for building with Xcode 11.3.1
  Update BananaLib build script to output archives in the gitignored build/DerivedData directory
  Update CoconutLib build script to output archives in the gitignored build/DerivedData directory
  Pull archive and validate script out as its own file
  Build the BananaLib XCFramework, include it in the example project, and update the ArchiveAndValidate script to inspect the results
  Create a BananaLib that will be used to build an xcframework using the Xcode 11 style of debug symbol placement
  Add ArchiveAndValidate aggregate target that ensures the expected dSYMs and BCSymbolMaps are present in the root of the archive
  Build the xcframework and install the pod in the example project
  Create a sample project and build script for generating an xcframework with Xcode 12 style debug symbols
  Add example scheme that was missing
  Update integration-specs submodule pointer
  #10111 - Update XCFramework installation to support Xcode 12 debug symbols placed as siblings of the .framework inside each architecture's directory
  • Loading branch information
dnkoutso committed Oct 20, 2020
2 parents 077301d + e9a8782 commit 7715ab5
Show file tree
Hide file tree
Showing 188 changed files with 4,428 additions and 30 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Expand Up @@ -35,10 +35,23 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#8649](https://github.com/CocoaPods/CocoaPods/issues/8649)


## 1.10.0 (2020-10-20)

##### Enhancements

* None.

##### Bug Fixes

* Generate the correct LD `-l` flags for XCFrameworks containing libraries
[Wes Campaigne](https://github.com/Westacular)
[#10071](https://github.com/CocoaPods/CocoaPods/issues/10071)

* Add support for automatically embeddeding XCFramework debug symbols for XCFrameworks generated with Xcode 12
[johntmcintosh](https://github.com/johntmcintosh)
[#10111](https://github.com/CocoaPods/CocoaPods/issues/10111)

## 1.10.0.rc.1 (2020-09-15)

##### Enhancements
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Expand Up @@ -7,10 +7,10 @@ GIT

GIT
remote: https://github.com/CocoaPods/Core.git
revision: 291a7c7e8e2ad293679baa52644f5c2f6a1b9846
revision: 4982927fd91da2efd775c726df82b34a34c88897
branch: master
specs:
cocoapods-core (1.10.0.rc.1)
cocoapods-core (1.10.0)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
algoliasearch (~> 1.0)
Expand All @@ -37,10 +37,10 @@ GIT

GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision: fe1ce4f4f6d37d227409da1574eb42163581eb06
revision: 84e5be06886829b90b6cd12e45a21d1cdbe8f448
branch: master
specs:
xcodeproj (1.18.0)
xcodeproj (1.19.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down Expand Up @@ -108,10 +108,10 @@ GIT
PATH
remote: .
specs:
cocoapods (1.10.0.rc.1)
cocoapods (1.10.0)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.0.rc.1)
cocoapods-core (= 1.10.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -125,7 +125,7 @@ PATH
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.17.0, < 2.0)
xcodeproj (>= 1.19.0, < 2.0)

GEM
remote: https://rubygems.org/
Expand All @@ -138,7 +138,7 @@ GEM
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.3)
algoliasearch (1.27.4)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
ast (2.4.0)
Expand Down
2 changes: 1 addition & 1 deletion cocoapods.gemspec
Expand Up @@ -37,7 +37,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'cocoapods-trunk', '>= 1.4.0', '< 2.0'
s.add_runtime_dependency 'cocoapods-try', '>= 1.1.0', '< 2.0'
s.add_runtime_dependency 'molinillo', '~> 0.6.6'
s.add_runtime_dependency 'xcodeproj', '>= 1.17.0', '< 2.0'
s.add_runtime_dependency 'xcodeproj', '>= 1.19.0', '< 2.0'

s.add_runtime_dependency 'colored2', '~> 3.1'
s.add_runtime_dependency 'escape', '~> 0.0.4'
Expand Down
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1170"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "079895922442BD33000FC943"
BuildableName = "AppUsingStaticLibraries.app"
BlueprintName = "AppUsingStaticLibraries"
ReferencedContainer = "container:VendoredXCFrameworkExample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "079895922442BD33000FC943"
BuildableName = "AppUsingStaticLibraries.app"
BlueprintName = "AppUsingStaticLibraries"
ReferencedContainer = "container:VendoredXCFrameworkExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "079895922442BD33000FC943"
BuildableName = "AppUsingStaticLibraries.app"
BlueprintName = "AppUsingStaticLibraries"
ReferencedContainer = "container:VendoredXCFrameworkExample.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
@@ -0,0 +1,18 @@
Pod::Spec.new do |spec|
spec.name = "BananaLib"
spec.version = "0.0.1"
spec.summary = "Amazing bananalib that provides access to bananas"
spec.description = "Amazing bananalib that provides access to bananas"
spec.homepage = "http://github.com/CocoaPods/CocoaPods"
spec.license = "MIT"
spec.author = 'Coconut Corp', { 'Monkey Boy' => 'monkey@coconut-corp.local' }
spec.source = { :git => "https://github.com/CocoaPods/CocoaPods.git", :tag => "#{spec.version}" }

spec.ios.deployment_target = '13.0'
spec.osx.deployment_target = '10.15'
spec.watchos.deployment_target = '3.0'
spec.tvos.deployment_target = '13.0'

spec.vendored_frameworks = 'build/BananaLib.xcframework'
spec.preserve_paths = 'build/BananaLib.dSYMs/iOS-Simulator.dSYM', 'build/BananaLib.dSYMs/iOS.dSYM', 'build/BananaLib.dSYMs/iOS-Catalyst.dSYM', 'build/BananaLib.dSYMs/macOS.dSYM', 'build/BananaLib.dSYMs/tvOS-Simulator.dSYM', 'build/BananaLib.dSYMs/tvOS.dSYM', 'build/BananaLib.dSYMs/watchOS-Simulator.dSYM', 'build/BananaLib.dSYMs/watchOS.dSYM'
end

0 comments on commit 7715ab5

Please sign in to comment.