Skip to content

Commit 4bbd58e

Browse files
author
Yuuki Nishiyama
committed
Fix Swift version related warnings
1 parent 04e8f88 commit 4bbd58e

File tree

7 files changed

+37
-23
lines changed

7 files changed

+37
-23
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ Carthage/Build
3939
Classes/.gitkeep
4040
Example/Podfile.lock
4141
Example/Pods/
42-
Example/com.awareframework.ios.sensor.core.xcworkspace/
42+
# Example/com.awareframework.ios.sensor.core.xcworkspace/

‎Example/com.awareframework.ios.sensor.core.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/* Begin PBXFileReference section */
3131
38DAC6DD22E5E8BEC871F5F3 /* Pods-com.awareframework.ios.sensor.core_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-com.awareframework.ios.sensor.core_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-com.awareframework.ios.sensor.core_Tests/Pods-com.awareframework.ios.sensor.core_Tests.release.xcconfig"; sourceTree = "<group>"; };
3232
3BE23AD26F05D1BD68E2FBCC /* Pods-com.awareframework.ios.sensor.core_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-com.awareframework.ios.sensor.core_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-com.awareframework.ios.sensor.core_Example/Pods-com.awareframework.ios.sensor.core_Example.release.xcconfig"; sourceTree = "<group>"; };
33-
4CAF43563E2A4AB4716B42DF /* com.awareframework.ios.sensor.core.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = com.awareframework.ios.sensor.core.podspec; path = ../com.awareframework.ios.sensor.core.podspec; sourceTree = "<group>"; };
33+
4CAF43563E2A4AB4716B42DF /* com.awareframework.ios.sensor.core.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = com.awareframework.ios.sensor.core.podspec; path = ../com.awareframework.ios.sensor.core.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
3434
607FACD01AFB9204008FA782 /* com.awareframework.ios.sensor.core_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = com.awareframework.ios.sensor.core_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
3535
607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3636
607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -207,17 +207,17 @@
207207
isa = PBXProject;
208208
attributes = {
209209
LastSwiftUpdateCheck = 0830;
210-
LastUpgradeCheck = 0830;
210+
LastUpgradeCheck = 1010;
211211
ORGANIZATIONNAME = CocoaPods;
212212
TargetAttributes = {
213213
607FACCF1AFB9204008FA782 = {
214214
CreatedOnToolsVersion = 6.3.1;
215215
DevelopmentTeam = FH352PYMNC;
216-
LastSwiftMigration = 0900;
216+
LastSwiftMigration = 1010;
217217
};
218218
607FACE41AFB9204008FA782 = {
219219
CreatedOnToolsVersion = 6.3.1;
220-
LastSwiftMigration = 0900;
220+
LastSwiftMigration = 1010;
221221
TestTargetID = 607FACCF1AFB9204008FA782;
222222
};
223223
};
@@ -400,12 +400,14 @@
400400
CLANG_WARN_BOOL_CONVERSION = YES;
401401
CLANG_WARN_COMMA = YES;
402402
CLANG_WARN_CONSTANT_CONVERSION = YES;
403+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
403404
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
404405
CLANG_WARN_EMPTY_BODY = YES;
405406
CLANG_WARN_ENUM_CONVERSION = YES;
406407
CLANG_WARN_INFINITE_RECURSION = YES;
407408
CLANG_WARN_INT_CONVERSION = YES;
408409
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
410+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
409411
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
410412
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
411413
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -453,12 +455,14 @@
453455
CLANG_WARN_BOOL_CONVERSION = YES;
454456
CLANG_WARN_COMMA = YES;
455457
CLANG_WARN_CONSTANT_CONVERSION = YES;
458+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
456459
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
457460
CLANG_WARN_EMPTY_BODY = YES;
458461
CLANG_WARN_ENUM_CONVERSION = YES;
459462
CLANG_WARN_INFINITE_RECURSION = YES;
460463
CLANG_WARN_INT_CONVERSION = YES;
461464
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
465+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
462466
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
463467
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
464468
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -499,8 +503,7 @@
499503
MODULE_NAME = ExampleApp;
500504
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
501505
PRODUCT_NAME = "$(TARGET_NAME)";
502-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
503-
SWIFT_VERSION = 4.0;
506+
SWIFT_VERSION = 4.2;
504507
};
505508
name = Debug;
506509
};
@@ -516,19 +519,15 @@
516519
MODULE_NAME = ExampleApp;
517520
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
518521
PRODUCT_NAME = "$(TARGET_NAME)";
519-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
520-
SWIFT_VERSION = 4.0;
522+
SWIFT_VERSION = 4.2;
521523
};
522524
name = Release;
523525
};
524526
607FACF31AFB9204008FA782 /* Debug */ = {
525527
isa = XCBuildConfiguration;
526528
baseConfigurationReference = F9D72138D0D02EE37C763B7E /* Pods-com.awareframework.ios.sensor.core_Tests.debug.xcconfig */;
527529
buildSettings = {
528-
FRAMEWORK_SEARCH_PATHS = (
529-
"$(SDKROOT)/Developer/Library/Frameworks",
530-
"$(inherited)",
531-
);
530+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
532531
GCC_PREPROCESSOR_DEFINITIONS = (
533532
"DEBUG=1",
534533
"$(inherited)",
@@ -537,8 +536,7 @@
537536
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
538537
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
539538
PRODUCT_NAME = "$(TARGET_NAME)";
540-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
541-
SWIFT_VERSION = 4.0;
539+
SWIFT_VERSION = 4.2;
542540
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/com.awareframework.ios.sensor.core_Example.app/com.awareframework.ios.sensor.core_Example";
543541
};
544542
name = Debug;
@@ -547,16 +545,12 @@
547545
isa = XCBuildConfiguration;
548546
baseConfigurationReference = 38DAC6DD22E5E8BEC871F5F3 /* Pods-com.awareframework.ios.sensor.core_Tests.release.xcconfig */;
549547
buildSettings = {
550-
FRAMEWORK_SEARCH_PATHS = (
551-
"$(SDKROOT)/Developer/Library/Frameworks",
552-
"$(inherited)",
553-
);
548+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
554549
INFOPLIST_FILE = Tests/Info.plist;
555550
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
556551
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
557552
PRODUCT_NAME = "$(TARGET_NAME)";
558-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
559-
SWIFT_VERSION = 4.0;
553+
SWIFT_VERSION = 4.2;
560554
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/com.awareframework.ios.sensor.core_Example.app/com.awareframework.ios.sensor.core_Example";
561555
};
562556
name = Release;

‎Example/com.awareframework.ios.sensor.core.xcodeproj/xcshareddata/xcschemes/com.awareframework.ios.sensor.core-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 = "0900"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example/com.awareframework.ios.sensor.core.xcworkspace/contents.xcworkspacedata‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/com.awareframework.ios.sensor.core.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Example/com.awareframework.ios.sensor.core/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}

‎com.awareframework.ios.sensor.core.podspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ com.awareframework.ios.sensor.core provides basic classes for developing your ow
2828
# s.social_media_url = 'https://twitter.com/tetujin23'
2929

3030
s.ios.deployment_target = '10.0'
31+
32+
s.swift_version = '4.2'
3133

3234
s.source_files = 'com.awareframework.ios.sensor.core/Classes/**/*'
3335

0 commit comments

Comments
 (0)