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 for Xcodeproj 1.20.0+ #318

Merged
merged 1 commit into from
Jul 29, 2021
Merged

Update integration specs for Xcodeproj 1.20.0+ #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions install_add_pod/after/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ Targets:
ATTRIBUTES:
- Project
- Sources:
- JSONKit-dummy.m
- JSONKit.m:
COMPILER_FLAGS: "-fno-objc-arc"
- JSONKit-dummy.m
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@igor-makarov is this diff related to this PR CocoaPods/Xcodeproj#839?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

its fine if it is by the way, just want to make sure I know where its coming from.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

verified that this was the reason. I updated to a SHA before this Pr was merged and regenerated integration specs and it did not include this diff.

will proceed with merging this.

- Frameworks: []
Build Configurations:
- Debug:
Expand Down Expand Up @@ -136,9 +136,9 @@ Targets:
ATTRIBUTES:
- Project
- Sources:
- Reachability-dummy.m
- Reachability.m:
COMPILER_FLAGS: "-fno-objc-arc"
- Reachability-dummy.m
- Frameworks: []
Build Configurations:
- Debug:
Expand Down
2 changes: 1 addition & 1 deletion ...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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
6 changes: 3 additions & 3 deletions install_circular_subspec_dependency/after/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ Targets:
ATTRIBUTES:
- Project
- Sources:
- Pod1-dummy.m
- Pod1.m
- Pod1-dummy.m
- Frameworks: []
Build Configurations:
- Debug:
Expand Down Expand Up @@ -108,8 +108,8 @@ Targets:
ATTRIBUTES:
- Project
- Sources:
- Pod2-dummy.m
- Pod2.m
- Pod2-dummy.m
- Frameworks: []
Build Configurations:
- Debug:
Expand Down Expand Up @@ -156,8 +156,8 @@ Targets:
ATTRIBUTES:
- Project
- Sources:
- Pod3-dummy.m
- Pod3.m
- Pod3-dummy.m
- Frameworks: []
Build Configurations:
- Debug:
Expand Down
2 changes: 1 addition & 1 deletion ...ency/after/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pod1.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...ency/after/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pod2.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...ency/after/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pod3.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-SubSpecCircular.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion install_custom_build_configuration/after/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ Targets:
ATTRIBUTES:
- Project
- Sources:
- Reachability-dummy.m
- Reachability.m:
COMPILER_FLAGS: "-fno-objc-arc"
- Reachability-dummy.m
- Frameworks: []
Build Configurations:
- 'Custom Debug - missing some settings ':
Expand Down
2 changes: 1 addition & 1 deletion .../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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...after/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/BananaLib.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...er/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-Example.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions install_custom_module_name/after/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,10 @@ Targets:
- SocketRocket:
Build Phases:
- Headers:
- SocketRocket-umbrella.h:
- SocketRocket.h:
ATTRIBUTES:
- Public
- SocketRocket.h:
- SocketRocket-umbrella.h:
ATTRIBUTES:
- Public
- SRWebSocket.h:
Expand Down
2 changes: 1 addition & 1 deletion ...er/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-Example.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...er/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/SocketRocket.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...after/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/libPusher.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion install_custom_workspace/after/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ Targets:
ATTRIBUTES:
- Project
- Sources:
- Reachability-dummy.m
- Reachability.m:
COMPILER_FLAGS: "-fno-objc-arc"
- Reachability-dummy.m
- Frameworks: []
Build Configurations:
- Debug:
Expand Down
2 changes: 1 addition & 1 deletion ...ods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-SampleApp_1.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...ods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-SampleApp_2.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...e/after/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/PodTest.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...er/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-iOS App.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-SampleAppTests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../INTEGRATION.xcuserdatad/xcschemes/SamplePodWithResources-SamplePodWithResources.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...ds.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/SamplePodWithResources.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...ods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/DepPod-framework.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/DepPod-library.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...proj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/HeaderMappingsDirPod-framework.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...deproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/HeaderMappingsDirPod-library.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-OtherSampleApp.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...ods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/DepPod-framework.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/DepPod-library.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...proj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/HeaderMappingsDirPod-framework.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...deproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/HeaderMappingsDirPod-library.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-OtherSampleApp.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion .../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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion install_local_source/after/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Targets:
ATTRIBUTES:
- Project
- Sources:
- Reachability-dummy.m
- Reachability.m:
COMPILER_FLAGS: "-fno-objc-arc"
- Reachability-dummy.m
- Frameworks: []
Build Configurations:
- Debug:
Expand Down
2 changes: 1 addition & 1 deletion ...er/Pods/Pods.xcodeproj/xcuserdata/INTEGRATION.xcuserdatad/xcschemes/Pods-iOS App.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Loading