Skip to content

Commit 5429f47

Browse files
author
sparmar
committed
Merge branch 'feature/swift-5.0-support' into develop
# Conflicts: # Example/Podfile # Example/Podfile.lock # Example/iStatusView.xcodeproj/project.pbxproj # Example/iStatusView/ViewController.swift # iStatusView.podspec
2 parents 0f10d38 + 707552f commit 5429f47

5 files changed

Lines changed: 36 additions & 37 deletions

File tree

Example/Podfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
platform :ios, '10.0'
21
use_frameworks!
32

43
target 'iStatusView_Example' do
@@ -9,9 +8,9 @@ target 'iStatusView_Example' do
98
target 'iStatusView_Tests' do
109
inherit! :search_paths
1110

12-
pod 'Quick', '~> 1.2.0'
11+
pod 'Quick', '~> 3.0'
1312
pod 'Nimble', '~> 8.0'
1413
pod 'FBSnapshotTestCase' , '~> 2.1.4'
15-
pod 'Nimble-Snapshots' , '~> 7.0'
14+
pod 'Nimble-Snapshots' , '~> 8.2'
1615
end
1716
end

Example/Podfile.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@ PODS:
44
- FBSnapshotTestCase/Core (2.1.4)
55
- FBSnapshotTestCase/SwiftSupport (2.1.4):
66
- FBSnapshotTestCase/Core
7-
- iOSSnapshotTestCase (6.0.2):
8-
- iOSSnapshotTestCase/SwiftSupport (= 6.0.2)
9-
- iOSSnapshotTestCase/Core (6.0.2)
10-
- iOSSnapshotTestCase/SwiftSupport (6.0.2):
7+
- iOSSnapshotTestCase (6.2.0):
8+
- iOSSnapshotTestCase/SwiftSupport (= 6.2.0)
9+
- iOSSnapshotTestCase/Core (6.2.0)
10+
- iOSSnapshotTestCase/SwiftSupport (6.2.0):
1111
- iOSSnapshotTestCase/Core
12-
- iStatusView (0.3.1)
13-
- Nimble (8.0.1)
14-
- Nimble-Snapshots (7.0.0):
15-
- Nimble-Snapshots/Core (= 7.0.0)
16-
- Nimble-Snapshots/Core (7.0.0):
12+
- iStatusView (0.4.0)
13+
- Nimble (8.1.1)
14+
- Nimble-Snapshots (8.2.1):
15+
- Nimble-Snapshots/Core (= 8.2.1)
16+
- Nimble-Snapshots/Core (8.2.1):
1717
- iOSSnapshotTestCase (~> 6.0)
1818
- Nimble (~> 8.0)
19-
- Quick (1.2.0)
20-
- SnapKit (4.2.0)
19+
- Quick (3.0.0)
20+
- SnapKit (5.0.1)
2121
- SVProgressHUD (2.2.5)
2222

2323
DEPENDENCIES:
2424
- FBSnapshotTestCase (~> 2.1.4)
2525
- iStatusView (from `../`)
2626
- Nimble (~> 8.0)
27-
- Nimble-Snapshots (~> 7.0)
28-
- Quick (~> 1.2.0)
27+
- Nimble-Snapshots (~> 8.2)
28+
- Quick (~> 3.0)
2929
- SnapKit
3030
- SVProgressHUD
3131

3232
SPEC REPOS:
33-
https://github.com/cocoapods/specs.git:
33+
trunk:
3434
- FBSnapshotTestCase
3535
- iOSSnapshotTestCase
3636
- Nimble
@@ -45,14 +45,14 @@ EXTERNAL SOURCES:
4545

4646
SPEC CHECKSUMS:
4747
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
48-
iOSSnapshotTestCase: 20083a7be9b8ef742610e16c79f15ad829441f29
49-
iStatusView: 4b774171417a9636a8d2e3a0ada6575fec647d59
50-
Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
51-
Nimble-Snapshots: 2d6d712ceb2d1850d88f850fbd7c732618106022
52-
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
53-
SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
48+
iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6
49+
iStatusView: 6814dde50423d68fb1755408c9616c5f0229e758
50+
Nimble: 5f8a2fb6fa343a7242dfdd9d42f7267419d464b2
51+
Nimble-Snapshots: 3a4750d83752625c8ebfdc588da105303ee2201e
52+
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
53+
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
5454
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
5555

56-
PODFILE CHECKSUM: d5321adb1d9cb08c8c51a7a80181f20b1131ee59
56+
PODFILE CHECKSUM: eeb5fc88f8168260d028ee9d3aeee0199038d0b0
5757

58-
COCOAPODS: 1.6.0
58+
COCOAPODS: 1.9.3

Example/iStatusView.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@
210210
TargetAttributes = {
211211
607FACCF1AFB9204008FA782 = {
212212
CreatedOnToolsVersion = 6.3.1;
213-
LastSwiftMigration = 0900;
213+
LastSwiftMigration = 1160;
214214
};
215215
607FACE41AFB9204008FA782 = {
216216
CreatedOnToolsVersion = 6.3.1;
217-
LastSwiftMigration = 0900;
217+
LastSwiftMigration = 1160;
218218
TestTargetID = 607FACCF1AFB9204008FA782;
219219
};
220220
};
@@ -431,7 +431,7 @@
431431
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
432432
GCC_WARN_UNUSED_FUNCTION = YES;
433433
GCC_WARN_UNUSED_VARIABLE = YES;
434-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
434+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
435435
MTL_ENABLE_DEBUG_INFO = YES;
436436
ONLY_ACTIVE_ARCH = YES;
437437
SDKROOT = iphoneos;
@@ -479,7 +479,7 @@
479479
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
480480
GCC_WARN_UNUSED_FUNCTION = YES;
481481
GCC_WARN_UNUSED_VARIABLE = YES;
482-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
482+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
483483
MTL_ENABLE_DEBUG_INFO = NO;
484484
SDKROOT = iphoneos;
485485
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -499,7 +499,7 @@
499499
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
500500
PRODUCT_NAME = "$(TARGET_NAME)";
501501
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
502-
SWIFT_VERSION = 4.2;
502+
SWIFT_VERSION = 5.0;
503503
};
504504
name = Debug;
505505
};
@@ -515,7 +515,7 @@
515515
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
516516
PRODUCT_NAME = "$(TARGET_NAME)";
517517
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
518-
SWIFT_VERSION = 4.2;
518+
SWIFT_VERSION = 5.0;
519519
};
520520
name = Release;
521521
};
@@ -537,7 +537,7 @@
537537
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
538538
PRODUCT_NAME = "$(TARGET_NAME)";
539539
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
540-
SWIFT_VERSION = 4.0;
540+
SWIFT_VERSION = 5.0;
541541
};
542542
name = Debug;
543543
};
@@ -555,7 +555,7 @@
555555
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
556556
PRODUCT_NAME = "$(TARGET_NAME)";
557557
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
558-
SWIFT_VERSION = 4.0;
558+
SWIFT_VERSION = 5.0;
559559
};
560560
name = Release;
561561
};

Example/iStatusView/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class ViewController: UIViewController {
148148
button.setTitleColor(UIColor.black, for: .normal)
149149
button.layer.cornerRadius = 4.0
150150
button.layer.borderWidth = 1.0
151-
button.contentEdgeInsets = UIEdgeInsets(top: 5, left: 10, bottom: 5, right: 10)
151+
button.contentEdgeInsets = UIEdgeInsets.init(top: 5, left: 10, bottom: 5, right: 10)
152152
button.backgroundColor = UIColor.white
153153
button.addTarget(self, action: #selector(statusViewButtonPressed), for: .touchUpInside)
154154
self.view.addSubview(button)

iStatusView.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'iStatusView'
11-
s.version = '0.3.1'
11+
s.version = '0.4.0'
1212
s.summary = 'iStatusView is a convenient way to show loading and message status in a view.'
1313

1414
# This description is used to generate tags and improve search results.
@@ -30,8 +30,8 @@ When an error has occured, the message can be displayed, and a rety button can b
3030
s.source = { :git => 'https://github.com/NextFaze/iStatusView.git', :tag => s.version.to_s }
3131
# s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
3232

33-
s.ios.deployment_target = '9.3'
34-
s.swift_version = '4.2'
33+
s.ios.deployment_target = '10.0'
34+
s.swift_version = '5.0'
3535

3636
s.source_files = 'iStatusView/Classes/**/*'
3737

0 commit comments

Comments
 (0)