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

Fix and rewrite sync_project.rb #3296

Merged
merged 5 commits into from
Jul 8, 2019
Merged

Fix and rewrite sync_project.rb #3296

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdd4469
Fix spacing
wilhuff Jun 29, 2019
8c99f89
Fix and rewrite sync_project.rb
wilhuff Jun 29, 2019
3c38be8
Run sync_project.rb on post-install
wilhuff Jul 1, 2019
e491aea
sync_project.rb generated changes
wilhuff Jul 2, 2019
ec61935
Review feedback
wilhuff Jul 4, 2019
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 Firestore/Example/Firestore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,9 +1412,9 @@
54C9EDF22040E16300A969CD /* SwiftTests */ = {
isa = PBXGroup;
children = (
124C932A22C1635300CA8C2D /* Integration */,
544A20ED20F6C046004E52CD /* API */,
5495EB012040E90200EBA509 /* Codable */,
124C932A22C1635300CA8C2D /* Integration */,
620C1427763BA5D3CCFB5A1F /* BridgingHeader.h */,
54C9EDF52040E16300A969CD /* Info.plist */,
);
Expand Down Expand Up @@ -3643,6 +3643,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
124C933122C16ACB00CA8C2D /* CodableIntegrationTests.swift in Sources */,
73866AA12082B0A5009BB4FF /* FIRArrayTransformTests.mm in Sources */,
5492E079202154D600B64F25 /* FIRCursorTests.mm in Sources */,
5492E075202154D600B64F25 /* FIRDatabaseTests.mm in Sources */,
Expand All @@ -3652,7 +3653,6 @@
D5B252EE3F4037405DB1ECE3 /* FIRNumericTransformTests.mm in Sources */,
5492E072202154D600B64F25 /* FIRQueryTests.mm in Sources */,
5492E077202154D600B64F25 /* FIRServerTimestampTests.mm in Sources */,
124C933122C16ACB00CA8C2D /* CodableIntegrationTests.swift in Sources */,
5492E07A202154D600B64F25 /* FIRTypeTests.mm in Sources */,
5492E076202154D600B64F25 /* FIRValidationTests.mm in Sources */,
5492E078202154D600B64F25 /* FIRWriteBatchTests.mm in Sources */,
Expand Down
10 changes: 10 additions & 0 deletions Firestore/Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

require 'pathname'

# Uncomment the next two lines for pre-release testing on internal repo
#source 'sso://cpdc-internal/firebase'
#source 'https://cdn.cocoapods.org/'
Expand All @@ -6,6 +9,13 @@ source 'https://cdn.cocoapods.org/'

use_frameworks!


post_install do |installer|
sync = Pathname.new(__FILE__).dirname.join('../../scripts/sync_project.rb')
system(sync.to_s)
end


target 'Firestore_Example_iOS' do
platform :ios, '8.0'

Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ case "$product-$method-$platform" in

# Firestore_IntegrationTests_iOS require Swift 4, which needs Xcode 9
# Other non-iOS platforms don't have swift integration tests yet.
if [["$platform" != 'iOS' || "$xcode_major" -ge 9 ]]; then
if [[ "$platform" != 'iOS' || "$xcode_major" -ge 9 ]]; then
RunXcodebuild \
-workspace 'Firestore/Example/Firestore.xcworkspace' \
-scheme "Firestore_IntegrationTests_$platform" \
Expand Down
Loading