Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Commit 0c0c017

Browse files
ArtSabintsevArtSabintsev
committed
Updated README, example project, and podspec for Swift4.2
1 parent b7766e9 commit 0c0c017

File tree

5 files changed

+44
-58
lines changed

5 files changed

+44
-58
lines changed

‎Gemfile‎

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

3-
gem "cocoapods"
3+
gem "cocoapods", "1.6.0.beta.1"
44
gem "synx"
55
gem "jazzy"

‎Gemfile.lock‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,53 @@ GEM
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
atomos (0.1.2)
10+
atomos (0.1.3)
1111
claide (1.0.2)
1212
clamp (0.6.5)
13-
cocoapods (1.4.0)
13+
cocoapods (1.6.0.beta.1)
1414
activesupport (>= 4.0.2, < 5)
1515
claide (>= 1.0.2, < 2.0)
16-
cocoapods-core (= 1.4.0)
16+
cocoapods-core (= 1.6.0.beta.1)
1717
cocoapods-deintegrate (>= 1.0.2, < 2.0)
18-
cocoapods-downloader (>= 1.1.3, < 2.0)
18+
cocoapods-downloader (>= 1.2.1, < 2.0)
1919
cocoapods-plugins (>= 1.0.0, < 2.0)
2020
cocoapods-search (>= 1.0.0, < 2.0)
2121
cocoapods-stats (>= 1.0.0, < 2.0)
22-
cocoapods-trunk (>= 1.3.0, < 2.0)
22+
cocoapods-trunk (>= 1.3.1, < 2.0)
2323
cocoapods-try (>= 1.1.0, < 2.0)
2424
colored2 (~> 3.1)
2525
escape (~> 0.0.4)
2626
fourflusher (~> 2.0.1)
2727
gh_inspector (~> 1.0)
28-
molinillo (~> 0.6.4)
28+
molinillo (~> 0.6.6)
2929
nap (~> 1.0)
30-
ruby-macho (~> 1.1)
31-
xcodeproj (>= 1.5.4, < 2.0)
32-
cocoapods-core (1.4.0)
30+
ruby-macho (~> 1.2)
31+
xcodeproj (>= 1.6.0, < 2.0)
32+
cocoapods-core (1.6.0.beta.1)
3333
activesupport (>= 4.0.2, < 6)
3434
fuzzy_match (~> 2.0.4)
3535
nap (~> 1.0)
3636
cocoapods-deintegrate (1.0.2)
37-
cocoapods-downloader (1.1.3)
37+
cocoapods-downloader (1.2.1)
3838
cocoapods-plugins (1.0.0)
3939
nap
4040
cocoapods-search (1.0.0)
4141
cocoapods-stats (1.0.0)
42-
cocoapods-trunk (1.3.0)
42+
cocoapods-trunk (1.3.1)
4343
nap (>= 0.8, < 2.0)
4444
netrc (~> 0.11)
4545
cocoapods-try (1.1.0)
4646
colored2 (3.1.2)
4747
colorize (0.8.1)
4848
concurrent-ruby (1.0.5)
4949
escape (0.0.4)
50-
ffi (1.9.23)
50+
ffi (1.9.25)
5151
fourflusher (2.0.1)
5252
fuzzy_match (2.0.4)
5353
gh_inspector (1.1.3)
5454
i18n (0.9.5)
5555
concurrent-ruby (~> 1.0)
56-
jazzy (0.9.1)
56+
jazzy (0.9.3)
5757
cocoapods (~> 1.0)
5858
mustache (~> 0.99)
5959
open4
@@ -64,19 +64,19 @@ GEM
6464
xcinvoke (~> 0.3.0)
6565
liferaft (0.0.6)
6666
minitest (5.11.3)
67-
molinillo (0.6.5)
67+
molinillo (0.6.6)
6868
mustache (0.99.8)
69-
nanaimo (0.2.4)
69+
nanaimo (0.2.6)
7070
nap (1.1.0)
7171
netrc (0.11.0)
7272
open4 (1.3.4)
7373
rb-fsevent (0.10.3)
7474
rb-inotify (0.9.10)
7575
ffi (>= 0.5.0, < 2)
7676
redcarpet (3.4.0)
77-
rouge (3.1.1)
78-
ruby-macho (1.1.0)
79-
sass (3.5.6)
77+
rouge (3.2.1)
78+
ruby-macho (1.2.0)
79+
sass (3.5.7)
8080
sass-listen (~> 4.0.0)
8181
sass-listen (4.0.0)
8282
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -91,20 +91,20 @@ GEM
9191
thread_safe (~> 0.1)
9292
xcinvoke (0.3.0)
9393
liferaft (~> 0.0.6)
94-
xcodeproj (1.5.7)
94+
xcodeproj (1.6.0)
9595
CFPropertyList (>= 2.3.3, < 4.0)
96-
atomos (~> 0.1.2)
96+
atomos (~> 0.1.3)
9797
claide (>= 1.0.2, < 2.0)
9898
colored2 (~> 3.1)
99-
nanaimo (~> 0.2.4)
99+
nanaimo (~> 0.2.6)
100100

101101
PLATFORMS
102102
ruby
103103

104104
DEPENDENCIES
105-
cocoapods
105+
cocoapods (= 1.6.0.beta.1)
106106
jazzy
107107
synx
108108

109109
BUNDLED WITH
110-
1.16.1
110+
1.16.4

‎Guitar.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
# Version
3-
s.version = '0.4.1'
4-
s.swift_version = '4.1'
3+
s.version = '0.5.0'
4+
s.swift_version = '4.2'
55

66
# Meta
77
s.name = 'Guitar'

‎GuitarExample/GuitarExample.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
PRODUCT_NAME = "$(TARGET_NAME)";
448448
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
449449
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
450-
SWIFT_VERSION = 4.0;
450+
SWIFT_VERSION = 4.2;
451451
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GuitarExample.app/GuitarExample";
452452
};
453453
name = Debug;
@@ -466,7 +466,7 @@
466466
PRODUCT_BUNDLE_IDENTIFIER = com.sabintsev.GuitarExampleTests;
467467
PRODUCT_NAME = "$(TARGET_NAME)";
468468
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
469-
SWIFT_VERSION = 4.0;
469+
SWIFT_VERSION = 4.2;
470470
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GuitarExample.app/GuitarExample";
471471
};
472472
name = Release;
@@ -492,7 +492,7 @@
492492
SKIP_INSTALL = YES;
493493
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
494494
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
495-
SWIFT_VERSION = 4.0;
495+
SWIFT_VERSION = 4.2;
496496
VERSIONING_SYSTEM = "apple-generic";
497497
VERSION_INFO_PREFIX = "";
498498
};
@@ -518,7 +518,7 @@
518518
PRODUCT_NAME = "$(TARGET_NAME)";
519519
SKIP_INSTALL = YES;
520520
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
521-
SWIFT_VERSION = 4.0;
521+
SWIFT_VERSION = 4.2;
522522
VERSIONING_SYSTEM = "apple-generic";
523523
VERSION_INFO_PREFIX = "";
524524
};
@@ -579,6 +579,8 @@
579579
SDKROOT = iphoneos;
580580
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
581581
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
582+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
583+
SWIFT_VERSION = 4.2;
582584
TARGETED_DEVICE_FAMILY = "1,2";
583585
};
584586
name = Debug;
@@ -630,6 +632,8 @@
630632
MTL_ENABLE_DEBUG_INFO = NO;
631633
SDKROOT = iphoneos;
632634
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
635+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
636+
SWIFT_VERSION = 4.2;
633637
TARGETED_DEVICE_FAMILY = "1,2";
634638
VALIDATE_PRODUCT = YES;
635639
};
@@ -649,7 +653,7 @@
649653
PRODUCT_BUNDLE_IDENTIFIER = "com.sabintsev.GuitarExample-iOS";
650654
PRODUCT_NAME = "$(TARGET_NAME)";
651655
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
652-
SWIFT_VERSION = 4.0;
656+
SWIFT_VERSION = 4.2;
653657
};
654658
name = Debug;
655659
};
@@ -667,7 +671,7 @@
667671
PRODUCT_BUNDLE_IDENTIFIER = "com.sabintsev.GuitarExample-iOS";
668672
PRODUCT_NAME = "$(TARGET_NAME)";
669673
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
670-
SWIFT_VERSION = 4.0;
674+
SWIFT_VERSION = 4.2;
671675
};
672676
name = Release;
673677
};

‎README.md‎

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,37 +34,19 @@ A small set of functions offered by Guitar were removed in v0.3.0 of the library
3434
| 3.1 | swift3.1 | No
3535

3636
### CocoaPods
37-
For Swift 4.1 support:
3837
```ruby
39-
pod 'Guitar'
40-
```
41-
42-
For Swift 3.2 support:
43-
```ruby
44-
pod 'Guitar', :git => 'https://github.com/ArtSabintsev/Guitar.git', :branch => 'swift3.2'
45-
```
46-
47-
For Swift 3.1 support:
48-
```ruby
49-
pod 'Guitar', :git => 'https://github.com/ArtSabintsev/Guitar.git', :branch => 'swift3.1'
38+
pod 'Guitar' # Swift 4.2
39+
pod 'Guitar', :git => 'https://github.com/ArtSabintsev/Guitar.git', :branch => 'swift4.1' # Swift 4.1
40+
pod 'Guitar', :git => 'https://github.com/ArtSabintsev/Guitar.git', :branch => 'swift3.2' # Swift 3.2
41+
pod 'Guitar', :git => 'https://github.com/ArtSabintsev/Guitar.git', :branch => 'swift3.1' # Swift 3.1
5042
```
5143

5244
### Carthage
53-
For Swift 4 support:
54-
55-
```swift
56-
github "ArtSabintsev/Guitar"
57-
```
58-
59-
For Swift 3.2 support:
60-
```swift
61-
github "ArtSabintsev/Guitar", "swift3.2"
62-
```
63-
64-
For Swift 3.1 support:
65-
6645
```swift
67-
github "ArtSabintsev/Guitar", "swift3.1"
46+
github "ArtSabintsev/Guitar" // Swift 4.2
47+
github "ArtSabintsev/Guitar", "swift4.1" // Swift 4.1
48+
github "ArtSabintsev/Guitar", "swift3.2" // Swift 3.2
49+
github "ArtSabintsev/Guitar", "swift3.1" // Swift 3.1
6850
```
6951

7052
### Swift Package Manager

0 commit comments

Comments
 (0)