Skip to content

Commit 4e46634

Browse files
committed
Merge branch 'develop' into issue/9-fullfill-order
2 parents 2c956e8 + c2fc6dc commit 4e46634

File tree

66 files changed

+2778
-811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2778
-811
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ xcuserdata/
2929
*.dSYM.zip
3030
*.dSYM
3131

32+
## Bundler
33+
/vendor/bundle/
34+
.bundle/
35+
36+
## Dependencies
37+
/vendor/
38+
3239
## Playgrounds
3340
timeline.xctimeline
3441
playground.xcworkspace

FluxSumi/FluxSumi/Base/EventBus.swift

Lines changed: 0 additions & 49 deletions
This file was deleted.

FluxSumi/FluxSumi/FluxSumi.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

FluxSumi/FluxSumi/Internal/Action+Internal.swift

Lines changed: 0 additions & 17 deletions
This file was deleted.

FluxSumi/FluxSumiTests/FluxC/Base/EventBusTests.swift

Lines changed: 0 additions & 43 deletions
This file was deleted.

FluxSumi/FluxSumiTests/FluxC/Mockups/MockupAcount.swift

Lines changed: 0 additions & 54 deletions
This file was deleted.

FluxSumi/FluxSumiTests/FluxC/Mockups/MockupDispatcher.swift

Lines changed: 0 additions & 12 deletions
This file was deleted.

FluxSumi/FluxSumiTests/FluxC/Mockups/MockupSite.swift

Lines changed: 0 additions & 54 deletions
This file was deleted.

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source 'https://rubygems.org' do
2+
gem 'rake'
3+
gem 'cocoapods', '~> 1.5.2'
4+
gem 'xcpretty-travis-formatter'
5+
end

Gemfile.lock

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.0)
5+
activesupport (4.2.10)
6+
i18n (~> 0.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
atomos (0.1.2)
11+
claide (1.0.2)
12+
cocoapods (1.5.3)
13+
activesupport (>= 4.0.2, < 5)
14+
claide (>= 1.0.2, < 2.0)
15+
cocoapods-core (= 1.5.3)
16+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17+
cocoapods-downloader (>= 1.2.0, < 2.0)
18+
cocoapods-plugins (>= 1.0.0, < 2.0)
19+
cocoapods-search (>= 1.0.0, < 2.0)
20+
cocoapods-stats (>= 1.0.0, < 2.0)
21+
cocoapods-trunk (>= 1.3.0, < 2.0)
22+
cocoapods-try (>= 1.1.0, < 2.0)
23+
colored2 (~> 3.1)
24+
escape (~> 0.0.4)
25+
fourflusher (~> 2.0.1)
26+
gh_inspector (~> 1.0)
27+
molinillo (~> 0.6.5)
28+
nap (~> 1.0)
29+
ruby-macho (~> 1.1)
30+
xcodeproj (>= 1.5.7, < 2.0)
31+
cocoapods-core (1.5.3)
32+
activesupport (>= 4.0.2, < 6)
33+
fuzzy_match (~> 2.0.4)
34+
nap (~> 1.0)
35+
cocoapods-deintegrate (1.0.2)
36+
cocoapods-downloader (1.2.0)
37+
cocoapods-plugins (1.0.0)
38+
nap
39+
cocoapods-search (1.0.0)
40+
cocoapods-stats (1.0.0)
41+
cocoapods-trunk (1.3.0)
42+
nap (>= 0.8, < 2.0)
43+
netrc (~> 0.11)
44+
cocoapods-try (1.1.0)
45+
colored2 (3.1.2)
46+
concurrent-ruby (1.0.5)
47+
escape (0.0.4)
48+
fourflusher (2.0.1)
49+
fuzzy_match (2.0.4)
50+
gh_inspector (1.1.3)
51+
i18n (0.9.5)
52+
concurrent-ruby (~> 1.0)
53+
minitest (5.11.3)
54+
molinillo (0.6.5)
55+
nanaimo (0.2.5)
56+
nap (1.1.0)
57+
netrc (0.11.0)
58+
rake (12.0.0)
59+
rouge (1.11.1)
60+
ruby-macho (1.1.0)
61+
thread_safe (0.3.6)
62+
tzinfo (1.2.5)
63+
thread_safe (~> 0.1)
64+
xcodeproj (1.5.9)
65+
CFPropertyList (>= 2.3.3, < 4.0)
66+
atomos (~> 0.1.2)
67+
claide (>= 1.0.2, < 2.0)
68+
colored2 (~> 3.1)
69+
nanaimo (~> 0.2.5)
70+
xcpretty (0.2.4)
71+
rouge (~> 1.8)
72+
xcpretty-travis-formatter (0.0.4)
73+
xcpretty (~> 0.2, >= 0.0.7)
74+
75+
PLATFORMS
76+
ruby
77+
78+
DEPENDENCIES
79+
cocoapods (~> 1.5.2)!
80+
rake!
81+
xcpretty-travis-formatter!
82+
83+
BUNDLED WITH
84+
1.16.1

0 commit comments

Comments
 (0)