Skip to content

Commit 21921a7

Browse files
lucdionlucdion
authored
Merge pull request #138 from layoutBox/update_gems
Update to Swift 5 + Update Gems
2 parents 5f708f5 + cfb61dc commit 21921a7

File tree

6 files changed

+52
-46
lines changed

6 files changed

+52
-46
lines changed

‎Example/FlexLayoutSample.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,11 @@
369369
isa = PBXProject;
370370
attributes = {
371371
LastSwiftUpdateCheck = 0830;
372-
LastUpgradeCheck = 0930;
372+
LastUpgradeCheck = 1030;
373373
ORGANIZATIONNAME = Mirego;
374374
TargetAttributes = {
375375
DF1F2A051F17D11700BA1B97 = {
376-
LastSwiftMigration = 1010;
376+
LastSwiftMigration = 1030;
377377
};
378378
};
379379
};
@@ -382,6 +382,7 @@
382382
developmentRegion = English;
383383
hasScannedForEncodings = 0;
384384
knownRegions = (
385+
English,
385386
en,
386387
Base,
387388
);
@@ -523,6 +524,7 @@
523524
isa = XCBuildConfiguration;
524525
buildSettings = {
525526
ALWAYS_SEARCH_USER_PATHS = NO;
527+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
526528
CLANG_ANALYZER_NONNULL = YES;
527529
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
528530
CLANG_CXX_LIBRARY = "libc++";
@@ -583,6 +585,7 @@
583585
isa = XCBuildConfiguration;
584586
buildSettings = {
585587
ALWAYS_SEARCH_USER_PATHS = NO;
588+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
586589
CLANG_ANALYZER_NONNULL = YES;
587590
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
588591
CLANG_CXX_LIBRARY = "libc++";
@@ -641,7 +644,7 @@
641644
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
642645
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
643646
PRODUCT_NAME = "$(TARGET_NAME)";
644-
SWIFT_VERSION = 4.2;
647+
SWIFT_VERSION = 5.0;
645648
};
646649
name = Debug;
647650
};
@@ -654,7 +657,7 @@
654657
INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
655658
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
656659
PRODUCT_NAME = "$(TARGET_NAME)";
657-
SWIFT_VERSION = 4.2;
660+
SWIFT_VERSION = 5.0;
658661
};
659662
name = Release;
660663
};

‎Example/FlexLayoutSample.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎FlexLayout.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -325,28 +325,29 @@
325325
isa = PBXProject;
326326
attributes = {
327327
LastSwiftUpdateCheck = 0830;
328-
LastUpgradeCheck = 0930;
328+
LastUpgradeCheck = 1030;
329329
ORGANIZATIONNAME = Mirego;
330330
TargetAttributes = {
331331
24DA37591EF843C500D1AB2F = {
332332
CreatedOnToolsVersion = 8.3.2;
333-
LastSwiftMigration = 1010;
333+
LastSwiftMigration = 1030;
334334
ProvisioningStyle = Manual;
335335
};
336336
24DA37621EF843C500D1AB2F = {
337337
CreatedOnToolsVersion = 8.3.2;
338338
DevelopmentTeam = F37Y9H9E46;
339-
LastSwiftMigration = 1010;
339+
LastSwiftMigration = 1030;
340340
ProvisioningStyle = Automatic;
341341
};
342342
};
343343
};
344344
buildConfigurationList = 24DA37541EF843C500D1AB2F /* Build configuration list for PBXProject "FlexLayout" */;
345345
compatibilityVersion = "Xcode 3.2";
346-
developmentRegion = English;
346+
developmentRegion = en;
347347
hasScannedForEncodings = 0;
348348
knownRegions = (
349349
en,
350+
Base,
350351
);
351352
mainGroup = 24DA37501EF843C500D1AB2F;
352353
productRefGroup = 24DA375B1EF843C500D1AB2F /* Products */;
@@ -465,6 +466,7 @@
465466
buildSettings = {
466467
ALWAYS_SEARCH_USER_PATHS = NO;
467468
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
469+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
468470
CLANG_ANALYZER_NONNULL = YES;
469471
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
470472
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -531,6 +533,7 @@
531533
buildSettings = {
532534
ALWAYS_SEARCH_USER_PATHS = NO;
533535
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
536+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
534537
CLANG_ANALYZER_NONNULL = YES;
535538
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
536539
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -611,7 +614,7 @@
611614
SKIP_INSTALL = YES;
612615
SWIFT_OBJC_BRIDGING_HEADER = "";
613616
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
614-
SWIFT_VERSION = 4.2;
617+
SWIFT_VERSION = 5.0;
615618
};
616619
name = Debug;
617620
};
@@ -639,7 +642,7 @@
639642
PROVISIONING_PROFILE_SPECIFIER = "";
640643
SKIP_INSTALL = YES;
641644
SWIFT_OBJC_BRIDGING_HEADER = "";
642-
SWIFT_VERSION = 4.2;
645+
SWIFT_VERSION = 5.0;
643646
};
644647
name = Release;
645648
};
@@ -653,7 +656,7 @@
653656
OTHER_LDFLAGS = "$(inherited)";
654657
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutTests;
655658
PRODUCT_NAME = "$(TARGET_NAME)";
656-
SWIFT_VERSION = 4.2;
659+
SWIFT_VERSION = 5.0;
657660
};
658661
name = Debug;
659662
};
@@ -667,7 +670,7 @@
667670
OTHER_LDFLAGS = "$(inherited)";
668671
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutTests;
669672
PRODUCT_NAME = "$(TARGET_NAME)";
670-
SWIFT_VERSION = 4.2;
673+
SWIFT_VERSION = 5.0;
671674
};
672675
name = Release;
673676
};

‎FlexLayout.xcodeproj/xcshareddata/xcschemes/FlexLayout.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Gemfile.lock‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ GEM
1111
public_suffix (>= 2.0.2, < 4.0)
1212
atomos (0.1.3)
1313
babosa (1.0.2)
14-
claide (1.0.2)
14+
claide (1.0.3)
1515
clamp (0.6.5)
16-
cocoapods (1.7.1)
16+
cocoapods (1.7.5)
1717
activesupport (>= 4.0.2, < 5)
1818
claide (>= 1.0.2, < 2.0)
19-
cocoapods-core (= 1.7.1)
19+
cocoapods-core (= 1.7.5)
2020
cocoapods-deintegrate (>= 1.0.3, < 2.0)
2121
cocoapods-downloader (>= 1.2.2, < 2.0)
2222
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -26,13 +26,13 @@ GEM
2626
cocoapods-try (>= 1.1.0, < 2.0)
2727
colored2 (~> 3.1)
2828
escape (~> 0.0.4)
29-
fourflusher (>= 2.2.0, < 3.0)
29+
fourflusher (>= 2.3.0, < 3.0)
3030
gh_inspector (~> 1.0)
3131
molinillo (~> 0.6.6)
3232
nap (~> 1.0)
3333
ruby-macho (~> 1.4)
34-
xcodeproj (>= 1.8.2, < 2.0)
35-
cocoapods-core (1.7.1)
34+
xcodeproj (>= 1.10.0, < 2.0)
35+
cocoapods-core (1.7.5)
3636
activesupport (>= 4.0.2, < 6)
3737
fuzzy_match (~> 2.0.4)
3838
nap (~> 1.0)
@@ -55,12 +55,12 @@ GEM
5555
declarative (0.0.10)
5656
declarative-option (0.1.0)
5757
digest-crc (0.4.1)
58-
domain_name (0.5.20180417)
58+
domain_name (0.5.20190701)
5959
unf (>= 0.0.5, < 1.0.0)
60-
dotenv (2.6.0)
60+
dotenv (2.7.5)
6161
emoji_regex (1.0.1)
6262
escape (0.0.4)
63-
excon (0.62.0)
63+
excon (0.65.0)
6464
faraday (0.15.4)
6565
multipart-post (>= 1.2, < 3)
6666
faraday-cookie_jar (0.0.6)
@@ -69,7 +69,7 @@ GEM
6969
faraday_middleware (0.13.1)
7070
faraday (>= 0.7.4, < 1.0)
7171
fastimage (2.1.5)
72-
fastlane (2.115.0)
72+
fastlane (2.128.1)
7373
CFPropertyList (>= 2.3, < 4.0.0)
7474
addressable (>= 2.3, < 3.0.0)
7575
babosa (>= 1.0.2, < 2.0.0)
@@ -88,8 +88,8 @@ GEM
8888
google-cloud-storage (>= 1.15.0, < 2.0.0)
8989
highline (>= 1.7.2, < 2.0.0)
9090
json (< 3.0.0)
91-
mini_magick (~> 4.5.1)
92-
multi_json
91+
jwt (~> 2.1.0)
92+
mini_magick (>= 4.9.4, < 5.0.0)
9393
multi_xml (~> 0.5)
9494
multipart-post (~> 2.0.0)
9595
plist (>= 3.1.0, < 4.0.0)
@@ -98,15 +98,15 @@ GEM
9898
security (= 0.1.3)
9999
simctl (~> 1.6.3)
100100
slack-notifier (>= 2.0.0, < 3.0.0)
101-
terminal-notifier (>= 1.6.2, < 2.0.0)
101+
terminal-notifier (>= 2.0.0, < 3.0.0)
102102
terminal-table (>= 1.4.5, < 2.0.0)
103103
tty-screen (>= 0.6.3, < 1.0.0)
104104
tty-spinner (>= 0.8.0, < 1.0.0)
105105
word_wrap (~> 1.0.0)
106-
xcodeproj (>= 1.6.0, < 2.0.0)
106+
xcodeproj (>= 1.8.1, < 2.0.0)
107107
xcpretty (~> 0.3.0)
108108
xcpretty-travis-formatter (>= 0.0.3)
109-
fourflusher (2.3.0)
109+
fourflusher (2.3.1)
110110
fuzzy_match (2.0.4)
111111
gh_inspector (1.1.3)
112112
google-api-client (0.23.9)
@@ -119,7 +119,7 @@ GEM
119119
signet (~> 0.9)
120120
google-cloud-core (1.3.0)
121121
google-cloud-env (~> 1.0)
122-
google-cloud-env (1.0.5)
122+
google-cloud-env (1.2.0)
123123
faraday (~> 0.11)
124124
google-cloud-storage (1.16.0)
125125
digest-crc (~> 0.4)
@@ -139,13 +139,13 @@ GEM
139139
httpclient (2.8.3)
140140
i18n (0.9.5)
141141
concurrent-ruby (~> 1.0)
142-
json (2.1.0)
142+
json (2.2.0)
143143
jwt (2.1.0)
144144
memoist (0.16.0)
145145
mime-types (3.2.2)
146146
mime-types-data (~> 3.2015)
147-
mime-types-data (3.2018.0812)
148-
mini_magick (4.5.1)
147+
mime-types-data (3.2019.0331)
148+
mini_magick (4.9.5)
149149
minitest (5.11.3)
150150
molinillo (0.6.6)
151151
multi_json (1.13.1)
@@ -155,7 +155,7 @@ GEM
155155
nap (1.1.0)
156156
naturally (2.2.0)
157157
netrc (0.11.0)
158-
os (1.0.0)
158+
os (1.0.1)
159159
plist (3.5.0)
160160
public_suffix (2.0.5)
161161
representable (3.0.4)
@@ -165,7 +165,7 @@ GEM
165165
retriable (3.1.2)
166166
rouge (2.0.7)
167167
ruby-macho (1.4.0)
168-
rubyzip (1.2.2)
168+
rubyzip (1.2.3)
169169
security (0.1.3)
170170
signet (0.11.0)
171171
addressable (~> 2.3)
@@ -180,23 +180,23 @@ GEM
180180
clamp (~> 0.6)
181181
colorize (~> 0.7)
182182
xcodeproj (~> 1.0)
183-
terminal-notifier (1.8.0)
183+
terminal-notifier (2.0.0)
184184
terminal-table (1.8.0)
185185
unicode-display_width (~> 1.1, >= 1.1.1)
186186
thread_safe (0.3.6)
187-
tty-cursor (0.6.0)
188-
tty-screen (0.6.5)
189-
tty-spinner (0.9.0)
190-
tty-cursor (~> 0.6.0)
187+
tty-cursor (0.7.0)
188+
tty-screen (0.7.0)
189+
tty-spinner (0.9.1)
190+
tty-cursor (~> 0.7)
191191
tzinfo (1.2.5)
192192
thread_safe (~> 0.1)
193193
uber (0.1.0)
194194
unf (0.1.4)
195195
unf_ext
196-
unf_ext (0.0.7.5)
197-
unicode-display_width (1.4.1)
196+
unf_ext (0.0.7.6)
197+
unicode-display_width (1.6.0)
198198
word_wrap (1.0.0)
199-
xcodeproj (1.9.0)
199+
xcodeproj (1.12.0)
200200
CFPropertyList (>= 2.3.3, < 4.0)
201201
atomos (~> 0.1.3)
202202
claide (>= 1.0.2, < 2.0)

‎Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- FlexLayout (1.3.14)
2+
- FlexLayout (1.3.16)
33
- Nimble (8.0.1)
44
- PinLayout (1.8.7)
55
- Quick (2.1.0)
@@ -24,12 +24,12 @@ EXTERNAL SOURCES:
2424
:path: "./"
2525

2626
SPEC CHECKSUMS:
27-
FlexLayout: 6e25c1c4aa373629458b4639f1359f46c4160e28
27+
FlexLayout: 2c9f7724c5218eb2f23c734dc4343141815a1681
2828
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
2929
PinLayout: a0722a5c8f0e0168a9c091ffe4930dabf0c8582c
3030
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
3131
SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
3232

3333
PODFILE CHECKSUM: 9c74b444ce1d9b0b90a0d90a353efb1f26fd93e2
3434

35-
COCOAPODS: 1.7.1
35+
COCOAPODS: 1.7.5

0 commit comments

Comments
 (0)