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

Xcode 10 adjustments #22

Merged
merged 11 commits into from
Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Updated travis.yml.
  • Loading branch information
huri000 committed Sep 27, 2018
commit 658d1227fa5c755c9aec9956bf67827144394470
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 7,6 @@ env:
global:
- WORKSPACE=Example/QuickLayout.xcworkspace
- SCHEME=QuickLayoutiOSDemo
- TEST_SDK=iphonesimulator

# travis cache isn't kept between builds
before_install:
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 3,8 @@ use_frameworks!
pod 'QuickLayout', :path => '../'

def testing_pods
pod 'Quick', '1.2.0'
pod 'Nimble', '7.3.0'
pod 'Quick', '1.3.2'
pod 'Nimble', '7.3.1'
end

target 'QuickLayoutiOSDemo' do
Expand Down
14 changes: 7 additions & 7 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 1,11 @@
PODS:
- Nimble (7.3.0)
- Quick (1.2.0)
- Nimble (7.3.1)
- Quick (1.3.2)
- QuickLayout (2.0.3)

DEPENDENCIES:
- Nimble (= 7.3.0)
- Quick (= 1.2.0)
- Nimble (= 7.3.1)
- Quick (= 1.3.2)
- QuickLayout (from `../`)

SPEC REPOS:
Expand All @@ -18,10 18,10 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Nimble: c8d6a1f463701921c46de965c673e13cafa09196
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
QuickLayout: f0cf4cb971bbb1f15cd211263a329883b676fd11

PODFILE CHECKSUM: bbf27a20c9e4b5b741f627936b0282c80b0da851
PODFILE CHECKSUM: d720bdfc32ce7952cb312b2e34d54002821cd3be

COCOAPODS: 1.5.3
14 changes: 7 additions & 7 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,312 changes: 648 additions & 664 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions Example/Pods/Quick/Sources/Quick/DSL/World DSL.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Example/Pods/Quick/Sources/Quick/Example.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Quick/Sources/Quick/World.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions Example/Pods/Quick/Sources/QuickObjectiveC/DSL/QCKDSL.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 0 additions & 20 deletions Example/Pods/Quick/Sources/QuickObjectiveC/DSL/World DSL.h

This file was deleted.

6 changes: 6 additions & 0 deletions Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions Example/Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 0 additions & 18 deletions Example/Pods/Quick/Sources/QuickObjectiveC/World.h

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Nimble-iOS/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Nimble-macOS/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Nimble-tvOS/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Quick-iOS/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Example/Pods/Target Support Files/Quick-macOS/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading