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.

Sign up for GitHub

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 integration specs #305

Open
wants to merge 11 commits into
base: merge1100final_into_master
Choose a base branch
from
Open

Update integration specs #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
66db35f
Fix XCFramework static library name in OTHER_LDFLAGS
Westacular Jan 6, 2021
78eec25
Merge pull request #307 from Westacular/fix_ld_flag_static_library_xc…
dnkoutso Jan 6, 2021
e4593bf
Merge branch '1-10-stable' into merge1101_into_master
dnkoutso Jan 7, 2021
f5aafbc
Merge pull request #308 from CocoaPods/merge1101_into_master
dnkoutso Jan 7, 2021
76f20ac
Update specs for: Add pre-integrate hook #9935
dcvz Jan 13, 2021
f7fcbfd
Merge pull request #309 from DoubleSymmetry/chore/update-spec-for-pr
dnkoutso Jan 13, 2021
45f024f
Include contents of generated projects in the integration specs
segiddins Jan 15, 2021
a9974cb
Ignore project.xcworkspace files
segiddins Jan 15, 2021
6069345
Spec update
segiddins Jan 15, 2021
6b7e796
Account for custom product names
segiddins Jan 16, 2021
9ef03db
fix xcconfig
langyanduan Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
tmp/
xcuserdata
.DS_Store
xcuserdata/*.xcuserdatad
!xcuserdata/INTEGRATION.xcuserdatad
project.xcworkspace
.DS_Store
0 ...single_platform/after/SampleApp.xcodeproj → ...after/SampleApp.xcodeproj/project.pbxproj
View file
Open in desktop
File renamed without changes.
14 changes: 5 additions & 9 deletions install_add_pod/after/Pods/Pods.xcodeproj → ...after/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ File References:
- Reachability.debug.xcconfig
- Reachability.release.xcconfig
- Products:
- libJSONKit.a
- libPods-SampleApp.a
- libReachability.a
- JSONKit
- Pods-SampleApp
- Reachability
- Targets Support Files:
- Pods-SampleApp:
- Pods-SampleApp-acknowledgements.markdown
Expand Down Expand Up @@ -50,7 +50,6 @@ Targets:
Build Settings:
ARCHS: "$(ARCHS_STANDARD_64_BIT)"
CLANG_ENABLE_OBJC_WEAK: 'NO'
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand All @@ -71,7 +70,6 @@ Targets:
Build Settings:
ARCHS: "$(ARCHS_STANDARD_64_BIT)"
CLANG_ENABLE_OBJC_WEAK: 'NO'
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand Down Expand Up @@ -100,7 +98,6 @@ Targets:
Build Settings:
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'NO'
ARCHS: "$(ARCHS_STANDARD_64_BIT)"
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand All @@ -118,7 +115,6 @@ Targets:
Build Settings:
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'NO'
ARCHS: "$(ARCHS_STANDARD_64_BIT)"
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand Down Expand Up @@ -149,7 +145,6 @@ Targets:
Build Settings:
ARCHS: "$(ARCHS_STANDARD_64_BIT)"
CLANG_ENABLE_OBJC_WEAK: 'NO'
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand All @@ -170,7 +165,6 @@ Targets:
Build Settings:
ARCHS: "$(ARCHS_STANDARD_64_BIT)"
CLANG_ENABLE_OBJC_WEAK: 'NO'
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand Down Expand Up @@ -218,6 +212,7 @@ Build Configurations:
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF: 'YES'
CLANG_WARN_OBJC_LITERAL_CONVERSION: 'YES'
CLANG_WARN_OBJC_ROOT_CLASS: YES_ERROR
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: 'YES'
CLANG_WARN_RANGE_LOOP_ANALYSIS: 'YES'
CLANG_WARN_STRICT_PROTOTYPES: 'YES'
CLANG_WARN_SUSPICIOUS_MOVE: 'YES'
Expand Down Expand Up @@ -278,6 +273,7 @@ Build Configurations:
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF: 'YES'
CLANG_WARN_OBJC_LITERAL_CONVERSION: 'YES'
CLANG_WARN_OBJC_ROOT_CLASS: YES_ERROR
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: 'YES'
CLANG_WARN_RANGE_LOOP_ANALYSIS: 'YES'
CLANG_WARN_STRICT_PROTOTYPES: 'YES'
CLANG_WARN_SUSPICIOUS_MOVE: 'YES'
Expand Down
58 changes: 58 additions & 0 deletions ...d/after/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/JSONKit.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E0E7B2B9DFD0E9A5E9C32D2ECFF05A28"
BuildableName = "libJSONKit.a"
BlueprintName = "JSONKit"
ReferencedContainer = "container:Pods.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">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
58 changes: 58 additions & 0 deletions .../Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-SampleApp.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7EFCCFB3480AA7EDB90F9DDD3E9E1D93"
BuildableName = "libPods-SampleApp.a"
BlueprintName = "Pods-SampleApp"
ReferencedContainer = "container:Pods.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">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
58 changes: 58 additions & 0 deletions ...er/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Reachability.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "CAA047C0F5E4106F3904E8497FA17F97"
BuildableName = "libReachability.a"
BlueprintName = "Reachability"
ReferencedContainer = "container:Pods.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">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
26 changes: 26 additions & 0 deletions ...Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>JSONKit.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
</dict>
<key>Pods-SampleApp.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
</dict>
<key>Reachability.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict/>
</dict>
</plist>
0 install_add_pod/after/SampleApp.xcodeproj → ...after/SampleApp.xcodeproj/project.pbxproj
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions install_add_pod/after/execution_output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Downloading dependencies
$ GIT_BIN clone https://github.com/tonymillion/Reachability.git PROJECT/Pods/Reachability --template= --single-branch --depth 1 --branch v3.1.0

- Running pre install hooks
- Running pre integrate hooks

Generating Pods project
- Creating Pods project
Expand Down
18 changes: 6 additions & 12 deletions ...spec_dependency/after/Pods/Pods.xcodeproj → ...after/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ File References:
- Pod3.release.xcconfig
- Frameworks: []
- Products:
- libPod1.a
- libPod2.a
- libPod3.a
- libPods-SubSpecCircular.a
- Pod1
- Pod2
- Pod3
- Pods-SubSpecCircular
- Targets Support Files:
- Pods-SubSpecCircular:
- Pods-SubSpecCircular-acknowledgements.markdown
Expand All @@ -66,7 +66,6 @@ Targets:
Build Configurations:
- Debug:
Build Settings:
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand All @@ -85,7 +84,6 @@ Targets:
Base Configuration: Pod1.debug.xcconfig
- Release:
Build Settings:
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand Down Expand Up @@ -116,7 +114,6 @@ Targets:
Build Configurations:
- Debug:
Build Settings:
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand All @@ -135,7 +132,6 @@ Targets:
Base Configuration: Pod2.debug.xcconfig
- Release:
Build Settings:
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand Down Expand Up @@ -166,7 +162,6 @@ Targets:
Build Configurations:
- Debug:
Build Settings:
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand All @@ -185,7 +180,6 @@ Targets:
Base Configuration: Pod3.debug.xcconfig
- Release:
Build Settings:
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand Down Expand Up @@ -213,7 +207,6 @@ Targets:
- Debug:
Build Settings:
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'NO'
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand All @@ -230,7 +223,6 @@ Targets:
- Release:
Build Settings:
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'NO'
CODE_SIGN_IDENTITY: iPhone Developer
CODE_SIGN_IDENTITY[sdk=appletvos*]: ''
CODE_SIGN_IDENTITY[sdk=iphoneos*]: ''
CODE_SIGN_IDENTITY[sdk=watchos*]: ''
Expand Down Expand Up @@ -275,6 +267,7 @@ Build Configurations:
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF: 'YES'
CLANG_WARN_OBJC_LITERAL_CONVERSION: 'YES'
CLANG_WARN_OBJC_ROOT_CLASS: YES_ERROR
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: 'YES'
CLANG_WARN_RANGE_LOOP_ANALYSIS: 'YES'
CLANG_WARN_STRICT_PROTOTYPES: 'YES'
CLANG_WARN_SUSPICIOUS_MOVE: 'YES'
Expand Down Expand Up @@ -335,6 +328,7 @@ Build Configurations:
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF: 'YES'
CLANG_WARN_OBJC_LITERAL_CONVERSION: 'YES'
CLANG_WARN_OBJC_ROOT_CLASS: YES_ERROR
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: 'YES'
CLANG_WARN_RANGE_LOOP_ANALYSIS: 'YES'
CLANG_WARN_STRICT_PROTOTYPES: 'YES'
CLANG_WARN_SUSPICIOUS_MOVE: 'YES'
Expand Down
Loading