Skip to content

Commit 7af7ead

Browse files
authored
Merge pull request #1 from sgr-ksmt/update_to_swift4
Update to swift4.1
2 parents 3f19010 + 624387d commit 7af7ead

File tree

11 files changed

+77
-59
lines changed

11 files changed

+77
-59
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.1

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# frozen_string_literal: true
22
source "https://rubygems.org"
33

4-
gem 'cocoapods', '~>1.4.beta'
4+
gem 'cocoapods', '1.5'

Gemfile.lock

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.5)
4+
CFPropertyList (3.0.0)
55
activesupport (4.2.10)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10+
atomos (0.1.2)
1011
claide (1.0.2)
11-
cocoapods (1.4.0.beta.2)
12+
cocoapods (1.5.0)
1213
activesupport (>= 4.0.2, < 5)
1314
claide (>= 1.0.2, < 2.0)
14-
cocoapods-core (= 1.4.0.beta.2)
15-
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16-
cocoapods-downloader (>= 1.1.3, < 2.0)
15+
cocoapods-core (= 1.5.0)
16+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17+
cocoapods-downloader (>= 1.2.0, < 2.0)
1718
cocoapods-plugins (>= 1.0.0, < 2.0)
1819
cocoapods-search (>= 1.0.0, < 2.0)
1920
cocoapods-stats (>= 1.0.0, < 2.0)
@@ -23,16 +24,16 @@ GEM
2324
escape (~> 0.0.4)
2425
fourflusher (~> 2.0.1)
2526
gh_inspector (~> 1.0)
26-
molinillo (~> 0.6.1)
27+
molinillo (~> 0.6.5)
2728
nap (~> 1.0)
2829
ruby-macho (~> 1.1)
29-
xcodeproj (>= 1.5.3, < 2.0)
30-
cocoapods-core (1.4.0.beta.2)
30+
xcodeproj (>= 1.5.7, < 2.0)
31+
cocoapods-core (1.5.0)
3132
activesupport (>= 4.0.2, < 6)
3233
fuzzy_match (~> 2.0.4)
3334
nap (~> 1.0)
34-
cocoapods-deintegrate (1.0.1)
35-
cocoapods-downloader (1.1.3)
35+
cocoapods-deintegrate (1.0.2)
36+
cocoapods-downloader (1.2.0)
3637
cocoapods-plugins (1.0.0)
3738
nap
3839
cocoapods-search (1.0.0)
@@ -46,29 +47,30 @@ GEM
4647
escape (0.0.4)
4748
fourflusher (2.0.1)
4849
fuzzy_match (2.0.4)
49-
gh_inspector (1.0.3)
50-
i18n (0.9.0)
50+
gh_inspector (1.1.3)
51+
i18n (0.9.5)
5152
concurrent-ruby (~> 1.0)
52-
minitest (5.10.3)
53-
molinillo (0.6.4)
54-
nanaimo (0.2.3)
53+
minitest (5.11.3)
54+
molinillo (0.6.5)
55+
nanaimo (0.2.5)
5556
nap (1.1.0)
5657
netrc (0.11.0)
5758
ruby-macho (1.1.0)
5859
thread_safe (0.3.6)
59-
tzinfo (1.2.4)
60+
tzinfo (1.2.5)
6061
thread_safe (~> 0.1)
61-
xcodeproj (1.5.3)
62-
CFPropertyList (~> 2.3.3)
62+
xcodeproj (1.5.7)
63+
CFPropertyList (>= 2.3.3, < 4.0)
64+
atomos (~> 0.1.2)
6365
claide (>= 1.0.2, < 2.0)
6466
colored2 (~> 3.1)
65-
nanaimo (~> 0.2.3)
67+
nanaimo (~> 0.2.4)
6668

6769
PLATFORMS
6870
ruby
6971

7072
DEPENDENCIES
71-
cocoapods (~> 1.4.beta)
73+
cocoapods (= 1.5)
7274

7375
BUNDLED WITH
74-
1.14.6
76+
1.16.1

Lobster.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Lobster"
3-
s.version = "0.1.0"
3+
s.version = "1.0"
44
s.summary = "Type-safe Firebase-RemoteConfig helper library"
55
s.homepage = "https://github.com/sgr-ksmt/Lobster"
66
s.license = 'MIT'

Lobster.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
163143F61FA8BE8600D25996 /* Project object */ = {
137137
isa = PBXProject;
138138
attributes = {
139-
LastUpgradeCheck = 0900;
139+
LastUpgradeCheck = 0930;
140140
ORGANIZATIONNAME = "Suguru Kishimoto";
141141
TargetAttributes = {
142142
163143FE1FA8BE8600D25996 = {
@@ -238,13 +238,15 @@
238238
CLANG_WARN_BOOL_CONVERSION = YES;
239239
CLANG_WARN_COMMA = YES;
240240
CLANG_WARN_CONSTANT_CONVERSION = YES;
241+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
241242
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
242243
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
243244
CLANG_WARN_EMPTY_BODY = YES;
244245
CLANG_WARN_ENUM_CONVERSION = YES;
245246
CLANG_WARN_INFINITE_RECURSION = YES;
246247
CLANG_WARN_INT_CONVERSION = YES;
247248
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
249+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
248250
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
249251
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
250252
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -298,13 +300,15 @@
298300
CLANG_WARN_BOOL_CONVERSION = YES;
299301
CLANG_WARN_COMMA = YES;
300302
CLANG_WARN_CONSTANT_CONVERSION = YES;
303+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
301304
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
302305
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
303306
CLANG_WARN_EMPTY_BODY = YES;
304307
CLANG_WARN_ENUM_CONVERSION = YES;
305308
CLANG_WARN_INFINITE_RECURSION = YES;
306309
CLANG_WARN_INT_CONVERSION = YES;
307310
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
311+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
308312
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
309313
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
310314
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

Lobster.xcodeproj/xcshareddata/xcschemes/Lobster.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"

Lobster.xcworkspace/contents.xcworkspacedata

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Podfile.lock

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
PODS:
2-
- Firebase/Core (4.4.0):
3-
- FirebaseAnalytics (= 4.0.4)
4-
- FirebaseCore (= 4.0.9)
5-
- Firebase/RemoteConfig (4.4.0):
2+
- Firebase/Core (4.13.0):
3+
- FirebaseAnalytics (= 4.2.0)
4+
- FirebaseCore (= 4.0.20)
5+
- Firebase/RemoteConfig (4.13.0):
66
- Firebase/Core
7-
- FirebaseRemoteConfig (= 2.0.3)
8-
- FirebaseAnalytics (4.0.4):
7+
- FirebaseRemoteConfig (= 2.1.3)
8+
- FirebaseABTesting (1.0.0):
9+
- FirebaseCore (~> 4.0)
10+
- Protobuf (~> 3.1)
11+
- FirebaseAnalytics (4.2.0):
912
- FirebaseCore (~> 4.0)
1013
- FirebaseInstanceID (~> 2.0)
1114
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
1215
- nanopb (~> 0.3)
13-
- FirebaseCore (4.0.9):
16+
- FirebaseCore (4.0.20):
1417
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
15-
- nanopb (~> 0.3)
16-
- FirebaseInstanceID (2.0.5)
17-
- FirebaseRemoteConfig (2.0.3):
18-
- FirebaseAnalytics (~> 4.0)
18+
- FirebaseInstanceID (2.0.10):
19+
- FirebaseCore (~> 4.0)
20+
- FirebaseRemoteConfig (2.1.3):
21+
- FirebaseABTesting (~> 1.0)
22+
- FirebaseAnalytics (~> 4.1)
23+
- FirebaseCore (~> 4.0)
1924
- FirebaseInstanceID (~> 2.0)
2025
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
21-
- Protobuf (~> 3.1)
26+
- Protobuf (~> 3.5)
2227
- GoogleToolboxForMac/Defines (2.1.3)
2328
- GoogleToolboxForMac/NSData+zlib (2.1.3):
2429
- GoogleToolboxForMac/Defines (= 2.1.3)
@@ -27,21 +32,22 @@ PODS:
2732
- nanopb/encode (= 0.3.8)
2833
- nanopb/decode (0.3.8)
2934
- nanopb/encode (0.3.8)
30-
- Protobuf (3.4.0)
35+
- Protobuf (3.5.0)
3136

3237
DEPENDENCIES:
3338
- Firebase/RemoteConfig
3439

3540
SPEC CHECKSUMS:
36-
Firebase: 3e92884a63e8f76d107c43a67d2ab9071e1eda10
37-
FirebaseAnalytics: 722b53c7b32bfc7806b06e0093a2f5180d4f2c5a
38-
FirebaseCore: ebe73f64302705e693b1de9919a76edbdd17a19d
39-
FirebaseInstanceID: f2b688c66b972f30d7fa9f5f9f91455454a03b47
40-
FirebaseRemoteConfig: 1c982f73af48ec048c8fa8621d5178cfdffac9aa
41+
Firebase: 5ec5e863d269d82d66b4bf56856726f8fb8f0fb3
42+
FirebaseABTesting: d07d0ee833b842d5153549e4c7e2e2cb1c23a3f9
43+
FirebaseAnalytics: 7ef69e76a5142f643aeb47c780e1cdce4e23632e
44+
FirebaseCore: 90cb1c53d69b556f112a1bf72b5fcfaad7650790
45+
FirebaseInstanceID: 8d20d890d65c917f9f7d9950b6e10a760ad34321
46+
FirebaseRemoteConfig: 3e95fb7c072308492e85fa41d59d38b3d6fd2372
4147
GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
4248
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
43-
Protobuf: 03eef2ee0b674770735cf79d9c4d3659cf6908e8
49+
Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03
4450

4551
PODFILE CHECKSUM: a0ac64af65ccc2a1ef76137a9390274ee3d1190c
4652

47-
COCOAPODS: 1.4.0.beta.2
53+
COCOAPODS: 1.4.0

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Type-safe Firebase-RemoteConfig helper library
33

44

55
[![GitHub release](https://img.shields.io/github/release/sgr-ksmt/Lobster.svg)](https://github.com/sgr-ksmt/Lobster/releases)
6-
![Language](https://img.shields.io/badge/language-Swift%204-orange.svg)
6+
![Language](https://img.shields.io/badge/language-Swift%204.1-orange.svg)
77
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
88
[![CocoaPods](https://img.shields.io/badge/Cocoa%20Pods-✓-4BC51D.svg?style=flat)](https://cocoapods.org/pods/Lobster)
99
[![CocoaPodsDL](https://img.shields.io/cocoapods/dt/Lobster.svg)](https://cocoapods.org/pods/Lobster)
@@ -127,7 +127,7 @@ support only hex: e.g. `"#FF00FF"`
127127
![](docs/img3.png)
128128

129129
#### CGPoint
130-
support text: e.g. `"[100, 100]"`
130+
support text: e.g. `"[100, 100]"`
131131
→ Use `DecodableConfigKey`(or `CodableConfigKey`)
132132

133133
```swift
@@ -137,7 +137,7 @@ extension ConfigKeys {
137137
```
138138

139139
#### CGSize
140-
support text: e.g. `"[100, 100]"`
140+
support text: e.g. `"[100, 100]"`
141141
→ Use `DecodableConfigKey`(or `CodableConfigKey`)
142142

143143
```swift
@@ -147,7 +147,7 @@ extension ConfigKeys {
147147
```
148148

149149
#### CGRect
150-
support text: e.g. `"[10, 10, 100, 100]"`
150+
support text: e.g. `"[10, 10, 100, 100]"`
151151
→ Use `DecodableConfigKey`(or `CodableConfigKey`)
152152

153153
```swift
@@ -161,13 +161,13 @@ extension ConfigKeys {
161161
![](docs/img4.png)
162162

163163
#### Enum
164-
supports `Int` or `String` rawValue.
164+
supports `Int` or `String` rawValue.
165165
If you want to use other enum, see "Use custom value".
166166

167-
#### Decodable compliant type
167+
#### Decodable compliant type
168168
read only
169169

170-
#### Codable compliant type
170+
#### Codable compliant type
171171
can set default value / read config value
172172

173173

@@ -271,7 +271,7 @@ Only **CocoaPods 1.4 Beta or higher**
271271
it, simply add the following line to your Podfile:
272272

273273
```ruby
274-
pod 'Lobster', '~> 0.1.0'
274+
pod 'Lobster', '~> 1.0'
275275
```
276276

277277
and run `pod install`

0 commit comments

Comments
 (0)