Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migration to swift 5 #8

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

migration to swift 5 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9422d71
Merge pull request #6 from tidepool-org/release/2.1.12
markyou Jun 19, 2019
46a0544
Merge pull request #7 from tidepool-org/release/2.1.12
markyou Jun 21, 2019
5575e0b
Merge 'origin/release/2.1.12' into develop
markyou Jun 21, 2019
ae05980
migration to swift 5
nathan990315 Apr 23, 2020
2b65d83
code optimisation
nathan990315 Apr 23, 2020
e54a90a
code optimisation
nathan990315 Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/CryptoSwift/Sources/CryptoSwift/Array+Extension.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/CryptoSwift/Sources/CryptoSwift/Digest.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Pods/CryptoSwift/Sources/CryptoSwift/Foundation/Array+Foundation.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF1.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/CryptoSwift/Sources/CryptoSwift/PKCS/PBKDF2.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/FLAnimatedImage/FLAnimatedImage/FLAnimatedImage.m
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 19 additions & 13 deletions Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 17 additions & 12 deletions TidepoolMobile.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1140;
ORGANIZATIONNAME = Tidepool;
TargetAttributes = {
4823986D2022628200EBB13C = {
Expand All @@ -1125,8 +1125,8 @@
};
4859FCB41B9A4DE4000C1269 = {
CreatedOnToolsVersion = 7.0;
DevelopmentTeam = 75U4X84TEG;
LastSwiftMigration = 1010;
DevelopmentTeam = UTCT485GR5;
LastSwiftMigration = 1140;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
Expand All @@ -1139,17 +1139,16 @@
};
4859FCCB1B9A4DE5000C1269 = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 1010;
LastSwiftMigration = 1140;
TestTargetID = 4859FCB41B9A4DE4000C1269;
};
};
};
buildConfigurationList = 4859FCB01B9A4DE4000C1269 /* Build configuration list for PBXProject "TidepoolMobile" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -1880,6 +1879,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 @@ -1936,6 +1936,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 @@ -1994,18 +1995,20 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 75U4X84TEG;
CURRENT_PROJECT_VERSION = 620;
DEVELOPMENT_TEAM = UTCT485GR5;
INFOPLIST_FILE = TidepoolMobile/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.1.13;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-D\" \"DEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.blipnotes;
PRODUCT_NAME = TidepoolMobile;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "TidepoolMobile/TidepoolMobile-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -2020,18 +2023,20 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 75U4X84TEG;
CURRENT_PROJECT_VERSION = 620;
DEVELOPMENT_TEAM = UTCT485GR5;
INFOPLIST_FILE = TidepoolMobile/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.1.13;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-D\" \"RELEASE\"";
PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.blipnotes;
PRODUCT_NAME = TidepoolMobile;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "TidepoolMobile/TidepoolMobile-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Osize";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -2049,7 +2054,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "TidepoolMobile/TidepoolMobileTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TidepoolMobile.app/TidepoolMobile";
};
name = Debug;
Expand All @@ -2067,7 +2072,7 @@
PRODUCT_BUNDLE_IDENTIFIER = org.tidepool.TidepoolMobileTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "TidepoolMobile/TidepoolMobileTests-Bridging-Header.h";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TidepoolMobile.app/TidepoolMobile";
};
name = Release;
Expand Down
4 changes: 2 additions & 2 deletions TidepoolMobile/GraphView/GraphingUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,12 @@ open class GraphingUtils {
fileprivate let kHourInSecs:TimeInterval = 3600.0
fileprivate func drawXAxisHeader() {
//// General Declarations
let context = UIGraphicsGetCurrentContext()
_ = UIGraphicsGetCurrentContext()
layout.figureXAxisTickTiming()
let tickTiming = layout.curXAxisLabelTickTiming

//// Frames - use whole view for background
let contents = CGRect(x: 0, y: 0, width: viewSize.width, height: viewSize.height)
_ = CGRect(x: 0, y: 0, width: viewSize.width, height: viewSize.height)
var graphStartSecs = startTime.timeIntervalSinceReferenceDate
if layout.useRelativeTimes {
graphStartSecs = startTime.timeIntervalSince(layout.graphStartTime as Date)
Expand Down
4 changes: 2 additions & 2 deletions TidepoolMobile/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.1.12</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
Expand Down
2 changes: 1 addition & 1 deletion TidepoolMobile/Resources/TidepoolMobileUIButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import UIKit
titleLabel.font = font
// Shortcut: this means the button only works with a single font color for disabled buttons: dimmedWhiteColor!
if let titleStr = titleLabel.text {
let disabledTitle = NSAttributedString(string: titleStr, attributes:[NSAttributedString.Key.font: titleLabel.font, NSAttributedString.Key.foregroundColor: Styles.dimmedWhiteColor])
let disabledTitle = NSAttributedString(string: titleStr, attributes:[NSAttributedString.Key.font: titleLabel.font!, NSAttributedString.Key.foregroundColor: Styles.dimmedWhiteColor])
self.setAttributedTitle(disabledTitle, for: UIControl.State.disabled)
}
}
Expand Down
Loading