Skip to content

Commit b1f3467

Browse files
author
Arda Oğul Üçpınar
committed
swift 5
1 parent 78011b9 commit b1f3467

File tree

7 files changed

+21
-16
lines changed

7 files changed

+21
-16
lines changed

ANActivityIndicator.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = 'ANActivityIndicator'
3-
s.version = '1.1.1'
4-
s.summary = 'ANActivityIndicator is pre-built indicator animations library written in Swift4.'
3+
s.version = '1.2.0'
4+
s.summary = 'ANActivityIndicator is pre-built indicator animations library written in Swift 5.'
55

66
s.description = <<-DESC
77
ANActivityIndicator is pre-built indicator animations library written in Swift4. You can easily create and show indicators locally or globally. Also you can create custom animations.
@@ -15,7 +15,7 @@ ANActivityIndicator is pre-built indicator animations library written in Swift4.
1515

1616
s.ios.deployment_target = '9.0'
1717
s.platform = :ios, '9.0'
18-
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
18+
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' }
1919

2020
s.source_files = 'Source/Classes/**/*'
2121

ANActivityIndicator/ANActivityIndicator.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@
321321
TargetAttributes = {
322322
A1F821B82002815200DEB12B = {
323323
CreatedOnToolsVersion = 9.2;
324+
LastSwiftMigration = 1020;
324325
ProvisioningStyle = Automatic;
325326
};
326327
A1F821C12002815200DEB12B = {
@@ -335,6 +336,7 @@
335336
hasScannedForEncodings = 0;
336337
knownRegions = (
337338
en,
339+
Base,
338340
);
339341
mainGroup = A1F821AF2002815200DEB12B;
340342
productRefGroup = A1F821BA2002815200DEB12B /* Products */;
@@ -601,7 +603,7 @@
601603
PRODUCT_BUNDLE_IDENTIFIER = com.avorna.ANActivityIndicator;
602604
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
603605
SKIP_INSTALL = YES;
604-
SWIFT_VERSION = 4.2;
606+
SWIFT_VERSION = 5.0;
605607
TARGETED_DEVICE_FAMILY = "1,2";
606608
};
607609
name = Debug;
@@ -623,7 +625,7 @@
623625
PRODUCT_BUNDLE_IDENTIFIER = com.avorna.ANActivityIndicator;
624626
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
625627
SKIP_INSTALL = YES;
626-
SWIFT_VERSION = 4.2;
628+
SWIFT_VERSION = 5.0;
627629
TARGETED_DEVICE_FAMILY = "1,2";
628630
};
629631
name = Release;

Example/Example.xcodeproj/project.pbxproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
TargetAttributes = {
128128
A1F821DB2002817000DEB12B = {
129129
CreatedOnToolsVersion = 9.2;
130+
LastSwiftMigration = 1020;
130131
ProvisioningStyle = Automatic;
131132
};
132133
};
@@ -311,13 +312,13 @@
311312
buildSettings = {
312313
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
313314
CODE_SIGN_STYLE = Automatic;
314-
DEVELOPMENT_TEAM = W9ZVWEMJZF;
315+
DEVELOPMENT_TEAM = Q4LMKGYTMD;
315316
INFOPLIST_FILE = Example/Info.plist;
316317
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
317318
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
318-
PRODUCT_BUNDLE_IDENTIFIER = com.avorna.Example;
319+
PRODUCT_BUNDLE_IDENTIFIER = com.avorna.ANActivityIndicatorExample;
319320
PRODUCT_NAME = "$(TARGET_NAME)";
320-
SWIFT_VERSION = 4.2;
321+
SWIFT_VERSION = 5.0;
321322
TARGETED_DEVICE_FAMILY = "1,2";
322323
};
323324
name = Debug;
@@ -327,13 +328,13 @@
327328
buildSettings = {
328329
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
329330
CODE_SIGN_STYLE = Automatic;
330-
DEVELOPMENT_TEAM = W9ZVWEMJZF;
331+
DEVELOPMENT_TEAM = Q4LMKGYTMD;
331332
INFOPLIST_FILE = Example/Info.plist;
332333
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
333334
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
334-
PRODUCT_BUNDLE_IDENTIFIER = com.avorna.Example;
335+
PRODUCT_BUNDLE_IDENTIFIER = com.avorna.ANActivityIndicatorExample;
335336
PRODUCT_NAME = "$(TARGET_NAME)";
336-
SWIFT_VERSION = 4.2;
337+
SWIFT_VERSION = 5.0;
337338
TARGETED_DEVICE_FAMILY = "1,2";
338339
};
339340
name = Release;

Example/Example/Info.plist

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
66
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>ANActivityIndicatorExample</string>
79
<key>CFBundleExecutable</key>
810
<string>$(EXECUTABLE_NAME)</string>
911
<key>CFBundleIdentifier</key>
@@ -15,7 +17,7 @@
1517
<key>CFBundlePackageType</key>
1618
<string>APPL</string>
1719
<key>CFBundleShortVersionString</key>
18-
<string>1.1</string>
20+
<string>1.2</string>
1921
<key>CFBundleVersion</key>
2022
<string>1</string>
2123
<key>LSRequiresIPhoneOS</key>

Source/Classes/ANActivityIndicatorPresenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public final class ANActivityIndicatorPresenter {
194194
if label.bounds.size.width > activityContainer.bounds.size.width {
195195
let maxWidth = activityContainer.bounds.size.width - 16
196196

197-
label.bounds.size = NSString(string: message).boundingRect(with: CGSize(width: maxWidth, height: CGFloat.greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font: label.font], context: nil).size
197+
label.bounds.size = NSString(string: message).boundingRect(with: CGSize(width: maxWidth, height: CGFloat.greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font: label.font ?? UIFont.systemFont(ofSize: 17)], context: nil).size
198198
}
199199
label.center = CGPoint(
200200
x: activityIndicatorView.center.x,

Source/Classes/ANActivityIndicatorView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public final class ANActivityIndicatorView: UIView {
5353
@IBInspectable public var padding: CGFloat = ANActivityIndicatorView.DEFAULT_PADDING
5454

5555
/// Current status of animation, read-only.
56-
@available(*, deprecated: 3.1)
56+
@available(*, deprecated)
5757
public var animating: Bool { return isAnimating }
5858

5959
/// Current status of animation, read-only.

Source/Classes/ANActivityIndicatorViewable.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public extension UIViewController {
2525
- parameter displayTimeThreshold: display time threshold to actually display UI blocker.
2626
- parameter minimumDisplayTime: minimum display time of UI blocker.
2727
*/
28-
public final func showIndicator(
28+
final func showIndicator(
2929
_ size: CGSize? = nil,
3030
message: String? = nil,
3131
messageFont: UIFont? = nil,
@@ -41,7 +41,7 @@ public extension UIViewController {
4141
/**
4242
Remove UI blocker.
4343
*/
44-
public final func hideIndicator() {
44+
final func hideIndicator() {
4545
ANActivityIndicatorPresenter.shared.hideIndicator()
4646
}
4747
}

0 commit comments

Comments
 (0)