Skip to content

Commit 8fe6a44

Browse files
authored
Merge pull request #4 from hslightnin/master
Swift 5.0
2 parents 9cbb0e2 + 9ed5f04 commit 8fe6a44

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

Source/TransitionButton.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Stop animation style of the `TransitionButton`.
232232

233233

234234
public extension UIImage {
235-
public convenience init?(color: UIColor, size: CGSize = CGSize(width: 1, height: 1)) {
235+
convenience init?(color: UIColor, size: CGSize = CGSize(width: 1, height: 1)) {
236236
let rect = CGRect(origin: .zero, size: size)
237237
UIGraphicsBeginImageContextWithOptions(rect.size, false, 0.0)
238238
color.setFill()

TransitionButton.xcodeproj/project.pbxproj

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,22 +167,23 @@
167167
TargetAttributes = {
168168
D93F1C971EAEDB6E009A7474 = {
169169
CreatedOnToolsVersion = 8.3.2;
170-
LastSwiftMigration = 0900;
170+
LastSwiftMigration = 1020;
171171
ProvisioningStyle = Automatic;
172172
};
173173
D93F1CA01EAEDB6E009A7474 = {
174174
CreatedOnToolsVersion = 8.3.2;
175-
LastSwiftMigration = 0900;
175+
LastSwiftMigration = 1020;
176176
ProvisioningStyle = Automatic;
177177
};
178178
};
179179
};
180180
buildConfigurationList = D93F1C921EAEDB6E009A7474 /* Build configuration list for PBXProject "TransitionButton" */;
181181
compatibilityVersion = "Xcode 3.2";
182-
developmentRegion = English;
182+
developmentRegion = en;
183183
hasScannedForEncodings = 0;
184184
knownRegions = (
185185
en,
186+
Base,
186187
);
187188
mainGroup = D93F1C8E1EAEDB6E009A7474;
188189
productRefGroup = D93F1C991EAEDB6E009A7474 /* Products */;
@@ -381,8 +382,7 @@
381382
PRODUCT_NAME = "$(TARGET_NAME)";
382383
SKIP_INSTALL = YES;
383384
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
384-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
385-
SWIFT_VERSION = 4.2;
385+
SWIFT_VERSION = 5.0;
386386
};
387387
name = Debug;
388388
};
@@ -403,8 +403,7 @@
403403
PRODUCT_BUNDLE_IDENTIFIER = com.itechnodev.TransitionButton;
404404
PRODUCT_NAME = "$(TARGET_NAME)";
405405
SKIP_INSTALL = YES;
406-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
407-
SWIFT_VERSION = 4.2;
406+
SWIFT_VERSION = 5.0;
408407
};
409408
name = Release;
410409
};
@@ -417,8 +416,7 @@
417416
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
418417
PRODUCT_BUNDLE_IDENTIFIER = com.itechnodev.TransitionButtonTests;
419418
PRODUCT_NAME = "$(TARGET_NAME)";
420-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
421-
SWIFT_VERSION = 4.2;
419+
SWIFT_VERSION = 5.0;
422420
};
423421
name = Debug;
424422
};
@@ -431,8 +429,7 @@
431429
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
432430
PRODUCT_BUNDLE_IDENTIFIER = com.itechnodev.TransitionButtonTests;
433431
PRODUCT_NAME = "$(TARGET_NAME)";
434-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
435-
SWIFT_VERSION = 4.2;
432+
SWIFT_VERSION = 5.0;
436433
};
437434
name = Release;
438435
};

TransitionButton.xcodeproj/xcshareddata/xcschemes/TransitionButton.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

iOS Example/iOS Example.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
isa = PBXProject;
123123
attributes = {
124124
LastSwiftUpdateCheck = 0830;
125-
LastUpgradeCheck = 0940;
125+
LastUpgradeCheck = 1020;
126126
ORGANIZATIONNAME = ITechnoDev;
127127
TargetAttributes = {
128128
D93F1CBF1EAEDD3F009A7474 = {
@@ -134,7 +134,7 @@
134134
};
135135
buildConfigurationList = D93F1CBB1EAEDD3F009A7474 /* Build configuration list for PBXProject "iOS Example" */;
136136
compatibilityVersion = "Xcode 3.2";
137-
developmentRegion = English;
137+
developmentRegion = en;
138138
hasScannedForEncodings = 0;
139139
knownRegions = (
140140
en,
@@ -181,6 +181,7 @@
181181
isa = XCBuildConfiguration;
182182
buildSettings = {
183183
ALWAYS_SEARCH_USER_PATHS = NO;
184+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
184185
CLANG_ANALYZER_NONNULL = YES;
185186
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
186187
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -241,6 +242,7 @@
241242
isa = XCBuildConfiguration;
242243
buildSettings = {
243244
ALWAYS_SEARCH_USER_PATHS = NO;
245+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
244246
CLANG_ANALYZER_NONNULL = YES;
245247
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
246248
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

iOS Example/iOS Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)