Skip to content

Commit 189f258

Browse files
committed
Finish Migrating to swift 4.2 (v1.3.0)
1 parent 5139bb8 commit 189f258

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed

Keyboard+LayoutGuide.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Keyboard+LayoutGuide'
3-
s.version = "1.2.3"
3+
s.version = "1.3.0"
44
s.summary = "Apple's missing KeyboardLayoutGuide"
55
s.homepage = "https://github.com/freshOS/KeyboardLayoutGuide"
66
s.license = { :type => "MIT", :file => "LICENSE" }

KeyboardLayoutGuide.framework.zip

26.5 KB
Binary file not shown.

KeyboardLayoutGuide/KeyboardLayoutGuide.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@
279279
SDKROOT = iphoneos;
280280
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
281281
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
282+
SWIFT_VERSION = 4.2;
282283
VERSIONING_SYSTEM = "apple-generic";
283284
VERSION_INFO_PREFIX = "";
284285
};
@@ -331,6 +332,7 @@
331332
MTL_ENABLE_DEBUG_INFO = NO;
332333
SDKROOT = iphoneos;
333334
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
335+
SWIFT_VERSION = 4.2;
334336
VALIDATE_PRODUCT = YES;
335337
VERSIONING_SYSTEM = "apple-generic";
336338
VERSION_INFO_PREFIX = "";

KeyboardLayoutGuide/KeyboardLayoutGuide.xcodeproj/xcshareddata/xcschemes/KeyboardLayoutGuide.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

KeyboardLayoutGuide/KeyboardLayoutGuide/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.2.2</string>
18+
<string>1.3.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSPrincipalClass</key>

KeyboardLayoutGuideExample/KeyboardLayoutGuideExample.xcodeproj/project.pbxproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
isa = PBXProject;
157157
attributes = {
158158
LastSwiftUpdateCheck = 0900;
159-
LastUpgradeCheck = 0900;
159+
LastUpgradeCheck = 1000;
160160
ORGANIZATIONNAME = freshos;
161161
TargetAttributes = {
162162
9902DE2F1FBB2659009E0D48 = {
@@ -279,13 +279,15 @@
279279
CLANG_WARN_BOOL_CONVERSION = YES;
280280
CLANG_WARN_COMMA = YES;
281281
CLANG_WARN_CONSTANT_CONVERSION = YES;
282+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
282283
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
283284
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
284285
CLANG_WARN_EMPTY_BODY = YES;
285286
CLANG_WARN_ENUM_CONVERSION = YES;
286287
CLANG_WARN_INFINITE_RECURSION = YES;
287288
CLANG_WARN_INT_CONVERSION = YES;
288289
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
290+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
289291
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
290292
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
291293
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -319,6 +321,7 @@
319321
SDKROOT = iphoneos;
320322
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
321323
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
324+
SWIFT_VERSION = 4.2;
322325
};
323326
name = Debug;
324327
};
@@ -336,13 +339,15 @@
336339
CLANG_WARN_BOOL_CONVERSION = YES;
337340
CLANG_WARN_COMMA = YES;
338341
CLANG_WARN_CONSTANT_CONVERSION = YES;
342+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
339343
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
340344
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
341345
CLANG_WARN_EMPTY_BODY = YES;
342346
CLANG_WARN_ENUM_CONVERSION = YES;
343347
CLANG_WARN_INFINITE_RECURSION = YES;
344348
CLANG_WARN_INT_CONVERSION = YES;
345349
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
350+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
346351
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
347352
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
348353
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -368,6 +373,7 @@
368373
MTL_ENABLE_DEBUG_INFO = NO;
369374
SDKROOT = iphoneos;
370375
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
376+
SWIFT_VERSION = 4.2;
371377
VALIDATE_PRODUCT = YES;
372378
};
373379
name = Release;
@@ -378,11 +384,12 @@
378384
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
379385
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
380386
CODE_SIGN_STYLE = Automatic;
387+
DEVELOPMENT_TEAM = 4TATSTJ3J3;
381388
INFOPLIST_FILE = KeyboardLayoutGuideExample/Info.plist;
382389
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
383390
PRODUCT_BUNDLE_IDENTIFIER = com.freshos.KeyboardLayoutGuideExample;
384391
PRODUCT_NAME = "$(TARGET_NAME)";
385-
SWIFT_VERSION = 4.0;
392+
SWIFT_VERSION = 4.2;
386393
TARGETED_DEVICE_FAMILY = "1,2";
387394
};
388395
name = Debug;
@@ -393,11 +400,12 @@
393400
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
394401
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
395402
CODE_SIGN_STYLE = Automatic;
403+
DEVELOPMENT_TEAM = 4TATSTJ3J3;
396404
INFOPLIST_FILE = KeyboardLayoutGuideExample/Info.plist;
397405
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
398406
PRODUCT_BUNDLE_IDENTIFIER = com.freshos.KeyboardLayoutGuideExample;
399407
PRODUCT_NAME = "$(TARGET_NAME)";
400-
SWIFT_VERSION = 4.0;
408+
SWIFT_VERSION = 4.2;
401409
TARGETED_DEVICE_FAMILY = "1,2";
402410
};
403411
name = Release;

KeyboardLayoutGuideExample/KeyboardLayoutGuideExample/AppDelegate.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import UIKit
1212
class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
15-
16-
17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
15+
16+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
1817
return true
1918
}
2019
}

0 commit comments

Comments
 (0)