Skip to content

Commit 5bbc1cb

Browse files
author
Eric Rolf
committed
Update to allow cocoapods to build and push.
1 parent dccd68d commit 5bbc1cb

File tree

4 files changed

+28
-27
lines changed

4 files changed

+28
-27
lines changed

CircleProgressView.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ Pod::Spec.new do |s|
1010
s.platform = :ios
1111
s.requires_arc = true
1212
s.source_files = 'ProgressView/*.swift'
13-
s.ios.deployment_target = "8.0"
14-
end
13+
s.ios.deployment_target = "9.0"
14+
end

CircleProgressView.xcodeproj/project.pbxproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@
171171
TargetAttributes = {
172172
CB095FC2199A8F44009C1C26 = {
173173
CreatedOnToolsVersion = 6.0;
174+
DevelopmentTeam = GAQ2528ADM;
174175
LastSwiftMigration = 0800;
175176
};
176177
CB095FD4199A8F44009C1C26 = {
@@ -347,10 +348,10 @@
347348
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
348349
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
349350
CLANG_ENABLE_MODULES = YES;
350-
DEVELOPMENT_TEAM = "";
351+
DEVELOPMENT_TEAM = GAQ2528ADM;
351352
INFOPLIST_FILE = CircleProgressView/Info.plist;
352353
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
353-
PRODUCT_BUNDLE_IDENTIFIER = "com.csg.$(PRODUCT_NAME:rfc1034identifier)";
354+
PRODUCT_BUNDLE_IDENTIFIER = com.csg.CircleProgressViewDemo;
354355
PRODUCT_NAME = "$(TARGET_NAME)";
355356
SWIFT_OBJC_BRIDGING_HEADER = "";
356357
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -364,10 +365,10 @@
364365
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
365366
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
366367
CLANG_ENABLE_MODULES = YES;
367-
DEVELOPMENT_TEAM = "";
368+
DEVELOPMENT_TEAM = GAQ2528ADM;
368369
INFOPLIST_FILE = CircleProgressView/Info.plist;
369370
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
370-
PRODUCT_BUNDLE_IDENTIFIER = "com.csg.$(PRODUCT_NAME:rfc1034identifier)";
371+
PRODUCT_BUNDLE_IDENTIFIER = com.csg.CircleProgressViewDemo;
371372
PRODUCT_NAME = "$(TARGET_NAME)";
372373
SWIFT_OBJC_BRIDGING_HEADER = "";
373374
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

CircleProgressView/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
1515

16-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
16+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
1717

1818
// Override point for customization after application launch.
1919
return true

ProgressView/CircleProgressView.swift

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

99
import UIKit
1010

11-
@objc @IBDesignable public class CircleProgressView: UIView {
11+
@objc @IBDesignable open class CircleProgressView: UIView {
1212

13-
private struct Constants {
13+
fileprivate struct Constants {
1414
let circleDegress = 360.0
1515
let minimumValue = 0.000001
1616
let maximumValue = 0.999999
@@ -19,60 +19,60 @@ import UIKit
1919
var contentView:UIView = UIView()
2020
}
2121

22-
private let constants = Constants()
23-
private var internalProgress:Double = 0.0
22+
fileprivate let constants = Constants()
23+
fileprivate var internalProgress:Double = 0.0
2424

25-
private var displayLink: CADisplayLink?
26-
private var destinationProgress: Double = 0.0
25+
fileprivate var displayLink: CADisplayLink?
26+
fileprivate var destinationProgress: Double = 0.0
2727

28-
@IBInspectable public var progress: Double = 0.000001 {
28+
@IBInspectable open var progress: Double = 0.000001 {
2929
didSet {
3030
internalProgress = progress
3131
setNeedsDisplay()
3232
}
3333
}
3434

35-
@IBInspectable public var refreshRate: Double = 0.0 {
35+
@IBInspectable open var refreshRate: Double = 0.0 {
3636
didSet { setNeedsDisplay() }
3737
}
3838

39-
@IBInspectable public var clockwise: Bool = true {
39+
@IBInspectable open var clockwise: Bool = true {
4040
didSet { setNeedsDisplay() }
4141
}
4242

43-
@IBInspectable public var trackWidth: CGFloat = 10 {
43+
@IBInspectable open var trackWidth: CGFloat = 10 {
4444
didSet { setNeedsDisplay() }
4545
}
4646

47-
@IBInspectable public var trackImage: UIImage? {
47+
@IBInspectable open var trackImage: UIImage? {
4848
didSet { setNeedsDisplay() }
4949
}
5050

51-
@IBInspectable public var trackBackgroundColor: UIColor = UIColor.gray {
51+
@IBInspectable open var trackBackgroundColor: UIColor = UIColor.gray {
5252
didSet { setNeedsDisplay() }
5353
}
5454

55-
@IBInspectable public var trackFillColor: UIColor = UIColor.blue {
55+
@IBInspectable open var trackFillColor: UIColor = UIColor.blue {
5656
didSet { setNeedsDisplay() }
5757
}
5858

59-
@IBInspectable public var trackBorderColor:UIColor = UIColor.clear {
59+
@IBInspectable open var trackBorderColor:UIColor = UIColor.clear {
6060
didSet { setNeedsDisplay() }
6161
}
6262

63-
@IBInspectable public var trackBorderWidth: CGFloat = 0 {
63+
@IBInspectable open var trackBorderWidth: CGFloat = 0 {
6464
didSet { setNeedsDisplay() }
6565
}
6666

67-
@IBInspectable public var centerFillColor: UIColor = UIColor.white {
67+
@IBInspectable open var centerFillColor: UIColor = UIColor.white {
6868
didSet { setNeedsDisplay() }
6969
}
7070

71-
@IBInspectable public var centerImage: UIImage? {
71+
@IBInspectable open var centerImage: UIImage? {
7272
didSet { setNeedsDisplay() }
7373
}
7474

75-
@IBInspectable public var contentView: UIView {
75+
@IBInspectable open var contentView: UIView {
7676
return self.constants.contentView
7777
}
7878

@@ -94,7 +94,7 @@ import UIKit
9494
displayLink?.isPaused = true
9595
}
9696

97-
override public func draw(_ rect: CGRect) {
97+
override open func draw(_ rect: CGRect) {
9898

9999
super.draw(rect)
100100

@@ -163,7 +163,7 @@ import UIKit
163163

164164
//MARK: - Progress Update
165165

166-
public func setProgress(_ newProgress: Double, animated: Bool) {
166+
open func setProgress(_ newProgress: Double, animated: Bool) {
167167

168168
if animated {
169169
destinationProgress = newProgress

0 commit comments

Comments
 (0)