Skip to content

Commit

Permalink
Updating to swift 5
Browse files Browse the repository at this point in the history
  • Loading branch information
cshireman committed Jul 3, 2019
1 parent fdce08c commit 1df0622
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
Binary file modified .DS_Store
Binary file not shown.
6 changes: 3 additions & 3 deletions DGRunkeeperSwitch.podspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|

s.name = "DGRunkeeperSwitch"
s.version = "1.1.5"
s.version = "1.1.6"
s.authors = { "Danil Gontovnik" => "[email protected]" }
s.homepage = "https://github.com/gontovnik/DGRunkeeperSwitch"
s.summary = "DGRunkeeperSwitch is Runkeeper design switch control"
s.source = { :git => "https://github.com/gontovnik/DGRunkeeperSwitch.git",
:tag => '1.1.4' }
s.source = { :git => "https://github.com/hathway/DGRunkeeperSwitch.git",
:tag => '1.1.6' }
s.license = { :type => "MIT", :file => "LICENSE" }
s.platform = :ios, '8.0'
s.source_files = "DGRunkeeperSwitch/**/*.swift"
Expand Down
2 changes: 1 addition & 1 deletion DGRunkeeperSwitch/DGRunkeeperSwitch.swift
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ open class DGRunkeeperSwitch: UIControl {
let titleLabelMaxHeight = bounds.height - selectedBackgroundInset * 2.0

zip(titleLabels, selectedTitleLabels).forEach { label, selectedLabel in
let index = titleLabels.index(of: label)!
let index = titleLabels.firstIndex(of: label)!

var size = label.sizeThatFits(CGSize(width: titleLabelMaxWidth, height: titleLabelMaxHeight))
size.width = min(size.width, titleLabelMaxWidth)
Expand Down
14 changes: 7 additions & 7 deletions DGRunkeeperSwitchExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
05B5DE921B98509500F87BB3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1010;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "Danil Gontovnik";
TargetAttributes = {
05B5DE991B98509500F87BB3 = {
Expand All @@ -162,13 +162,13 @@
};
4508BA3B1C0CF52700BC38BE = {
CreatedOnToolsVersion = 7.1.1;
LastSwiftMigration = 1010;
LastSwiftMigration = 1020;
};
};
};
buildConfigurationList = 05B5DE951B98509500F87BB3 /* Build configuration list for PBXProject "DGRunkeeperSwitchExample" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -250,6 +250,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -305,6 +306,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -394,8 +396,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.gatafan.DGRunkeeperSwitch;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -418,8 +419,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.gatafan.DGRunkeeperSwitch;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit 1df0622

Please sign in to comment.