Skip to content

Commit

Permalink
Swift 5.0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
andreamazz committed Apr 11, 2019
1 parent 322bb44 commit 269f372
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5.0
6 changes: 3 additions & 3 deletions DemoApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- SwiftSpinner (1.6.2)
- SwiftSpinner (1.7.0)

DEPENDENCIES:
- SwiftSpinner (from `..`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: ".."

SPEC CHECKSUMS:
SwiftSpinner: 1e2d5833509caccd1c17bb2edc33ea12b881b698
SwiftSpinner: e7da6c9e2fab46442c02726d2e30105c1a84c59d

PODFILE CHECKSUM: 5adf66974bfcbc3d3779f9ca34933795856ca3dc

COCOAPODS: 1.5.3
COCOAPODS: 1.6.1
15 changes: 6 additions & 9 deletions DemoApp/SwiftSpinnerDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,16 @@
9C6D4F0C1A6BFE8500B10961 = {
CreatedOnToolsVersion = 6.2;
DevelopmentTeam = H72GR44F4M;
LastSwiftMigration = 0900;
LastSwiftMigration = 1020;
ProvisioningStyle = Manual;
};
};
};
buildConfigurationList = 9C6D4F081A6BFE8500B10961 /* Build configuration list for PBXProject "SwiftSpinnerDemo" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -178,7 +177,7 @@
inputFileListPaths = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-SwiftSpinnerDemo/Pods-SwiftSpinnerDemo-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-SwiftSpinnerDemo/Pods-SwiftSpinnerDemo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftSpinner/SwiftSpinner.framework",
);
name = "[CP] Embed Pods Frameworks";
Expand All @@ -189,7 +188,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwiftSpinnerDemo/Pods-SwiftSpinnerDemo-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SwiftSpinnerDemo/Pods-SwiftSpinnerDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
B8923B58542177DAC45C73FB /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -367,8 +366,7 @@
PROVISIONING_PROFILE = "f7168a28-8f3d-4e45-bcbd-a54a870789e7";
PROVISIONING_PROFILE_SPECIFIER = Development;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -388,8 +386,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "f7168a28-8f3d-4e45-bcbd-a54a870789e7";
PROVISIONING_PROFILE_SPECIFIER = Development;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion SwiftSpinner.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SwiftSpinner"
s.version = "1.6.2"
s.version = "1.7.0"
s.summary = "A beautiful activity indicator written in Swift"
s.description = <<-DESC
SwiftSpinner is an extra beautiful activity indicator with plain and bold style fitting iOS 8 design very well. It uses dynamic blur and translucency to overlay the current screen contents and display an activity indicator with text (or the so called “spinner”).
Expand Down
9 changes: 6 additions & 3 deletions SwiftSpinner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,11 @@
};
buildConfigurationList = D20C82F31C77C1F1002CA000 /* Build configuration list for PBXProject "SwiftSpinner" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = D20C82EF1C77C1F1002CA000;
productRefGroup = D20C82FA1C77C1F2002CA000 /* Products */;
Expand Down Expand Up @@ -262,6 +263,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -313,6 +315,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -336,7 +339,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -356,7 +359,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
3 changes: 1 addition & 2 deletions SwiftSpinner/SwiftSpinner.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public class SwiftSpinner: UIView {
titleLabel.adjustsFontSizeToFitWidth = true
titleLabel.textColor = UIColor.white


blurView.contentView.addSubview(titleLabel)
blurView.contentView.addSubview(vibrancyView)

Expand Down Expand Up @@ -222,7 +221,7 @@ public class SwiftSpinner: UIView {
let token = UUID().uuidString
delayedTokens.append(token)
SwiftSpinner.sharedInstance.delay(delay, completion: {
if let index = delayedTokens.index(of: token) {
if let index = delayedTokens.firstIndex(of: token) {
delayedTokens.remove(at: index)
SwiftSpinner.show(title, animated: animated)
}
Expand Down

0 comments on commit 269f372

Please sign in to comment.