Skip to content
This repository was archived by the owner on Apr 7, 2021. It is now read-only.

Commit e4e26af

Browse files
masashi-sutoumasashi-sutou
authored
Merge pull request #4 from studyplus/xcode9_and_swift4
Xcode9 and swift4
2 parents 93f5b34 + e2df113 commit e4e26af

File tree

17 files changed

+157
-94
lines changed

17 files changed

+157
-94
lines changed

‎.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.0

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
1.1.0 Release notes (2017-09-19)
2+
=============================================================
3+
4+
### API Breaking Changes
5+
6+
* None.
7+
8+
### Enhancements
9+
10+
* Build with Xcode 9 and Converted the project to Swift 4
11+
12+
### Bugfixes
13+
14+
* None.
15+
116
1.0.9 Release notes (2017-07-06)
217
=============================================================
318

‎Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "kishikawakatsumi/KeychainAccess" == 3.0.2
1+
github "kishikawakatsumi/KeychainAccess" == 3.1.0

‎Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "kishikawakatsumi/KeychainAccess" "v3.0.2"
1+
github "kishikawakatsumi/KeychainAccess" "v3.1.0"

‎Demo/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
"idiom" : "ipad",
8585
"size" : "83.5x83.5",
8686
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
8792
}
8893
],
8994
"info" : {

‎Demo/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>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.9</string>
18+
<string>1.1.0</string>
1919
<key>CFBundleURLTypes</key>
2020
<array>
2121
<dict>

‎Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ platform :ios, '8.0'
33
use_frameworks!
44

55
target :Demo do
6-
pod 'KeychainAccess', '3.0.2'
6+
pod 'KeychainAccess', '3.1.0'
77
end

‎Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
PODS:
2-
- KeychainAccess (3.0.2)
2+
- KeychainAccess (3.1.0)
33

44
DEPENDENCIES:
5-
- KeychainAccess (= 3.0.2)
5+
- KeychainAccess (= 3.1.0)
66

77
SPEC CHECKSUMS:
8-
KeychainAccess: a986406022dfc7c634c691ad3bec670cc6a32002
8+
KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da
99

10-
PODFILE CHECKSUM: 99cb6e8dd53026dd13517c24451af319e5c1a23a
10+
PODFILE CHECKSUM: 5d59a864df1b8c7fb07b7cc4f11a87235ba9692c
1111

12-
COCOAPODS: 1.2.1
12+
COCOAPODS: 1.3.1

‎StudyplusSDK-V2.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "StudyplusSDK-V2"
3-
s.version = "1.0.9"
3+
s.version = "1.1.0"
44
s.summary = "StudyplusSDK-V2 is Studyplus iOS SDK for Swift"
55
s.homepage = "http://info.studyplus.jp"
66
s.license = { :type => "MIT", :file => "LICENSE" }
@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
1111
s.ios.deployment_target = '8.0'
1212
s.ios.frameworks = ['UIKit', 'Foundation']
1313
s.author = { "studyplus" => "[email protected]" }
14-
s.dependency 'KeychainAccess', '3.0.2'
14+
s.dependency 'KeychainAccess', '3.1.0'
1515
end
1616

‎StudyplusSDK.xcodeproj/project.pbxproj

Lines changed: 55 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
183FDAB11E754DCB0085589F /* StudyplusAPIRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB01E754DCB0085589F /* StudyplusAPIRequest.swift */; };
2323
183FDAB31E7561B90085589F /* StudyplusRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB21E7561B90085589F /* StudyplusRecord.swift */; };
2424
183FDAB51E7584C50085589F /* StudyplusRecordAmount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183FDAB41E7584C50085589F /* StudyplusRecordAmount.swift */; };
25-
183FDAB91E759E0F0085589F /* StudyplusSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; };
26-
183FDABA1E759E0F0085589F /* StudyplusSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2725
486C64C31E94E3BD00FCFE74 /* KeychainAccess.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 486C64C21E94E3BD00FCFE74 /* KeychainAccess.framework */; };
26+
48D53DA61F72346A00FDB105 /* StudyplusSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; };
27+
48D53DA71F72346A00FDB105 /* StudyplusSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 183FDA671E7510920085589F /* StudyplusSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2828
879C2B31A68B2AB725BEC317 /* Pods_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F2BF8D56E016A5AA66C8A96 /* Pods_Demo.framework */; };
2929
/* End PBXBuildFile section */
3030

@@ -43,7 +43,7 @@
4343
remoteGlobalIDString = 183FDA841E7510F00085589F;
4444
remoteInfo = Demo;
4545
};
46-
183FDABB1E759E0F0085589F /* PBXContainerItemProxy */ = {
46+
48D53DA81F72346A00FDB105 /* PBXContainerItemProxy */ = {
4747
isa = PBXContainerItemProxy;
4848
containerPortal = 183FDA5E1E7510920085589F /* Project object */;
4949
proxyType = 1;
@@ -53,13 +53,13 @@
5353
/* End PBXContainerItemProxy section */
5454

5555
/* Begin PBXCopyFilesBuildPhase section */
56-
183FDABD1E759E0F0085589F /* Embed Frameworks */ = {
56+
48D53DAA1F72346A00FDB105 /* Embed Frameworks */ = {
5757
isa = PBXCopyFilesBuildPhase;
5858
buildActionMask = 2147483647;
5959
dstPath = "";
6060
dstSubfolderSpec = 10;
6161
files = (
62-
183FDABA1E759E0F0085589F /* StudyplusSDK.framework in Embed Frameworks */,
62+
48D53DA71F72346A00FDB105 /* StudyplusSDK.framework in Embed Frameworks */,
6363
);
6464
name = "Embed Frameworks";
6565
runOnlyForDeploymentPostprocessing = 0;
@@ -117,8 +117,8 @@
117117
isa = PBXFrameworksBuildPhase;
118118
buildActionMask = 2147483647;
119119
files = (
120-
183FDAB91E759E0F0085589F /* StudyplusSDK.framework in Frameworks */,
121120
879C2B31A68B2AB725BEC317 /* Pods_Demo.framework in Frameworks */,
121+
48D53DA61F72346A00FDB105 /* StudyplusSDK.framework in Frameworks */,
122122
);
123123
runOnlyForDeploymentPostprocessing = 0;
124124
};
@@ -279,14 +279,14 @@
279279
183FDA811E7510F00085589F /* Sources */,
280280
183FDA821E7510F00085589F /* Frameworks */,
281281
183FDA831E7510F00085589F /* Resources */,
282-
183FDABD1E759E0F0085589F /* Embed Frameworks */,
283282
764BEF1941D689B54DF91C96 /* [CP] Embed Pods Frameworks */,
284283
0D84BAE00562247D34CA7850 /* [CP] Copy Pods Resources */,
284+
48D53DAA1F72346A00FDB105 /* Embed Frameworks */,
285285
);
286286
buildRules = (
287287
);
288288
dependencies = (
289-
183FDABC1E759E0F0085589F /* PBXTargetDependency */,
289+
48D53DA91F72346A00FDB105 /* PBXTargetDependency */,
290290
);
291291
name = Demo;
292292
productName = Demo;
@@ -318,24 +318,27 @@
318318
isa = PBXProject;
319319
attributes = {
320320
LastSwiftUpdateCheck = 0820;
321-
LastUpgradeCheck = 0830;
321+
LastUpgradeCheck = 0900;
322322
ORGANIZATIONNAME = studyplus;
323323
TargetAttributes = {
324324
183FDA661E7510920085589F = {
325325
CreatedOnToolsVersion = 8.2.1;
326-
LastSwiftMigration = 0820;
326+
LastSwiftMigration = 0900;
327327
ProvisioningStyle = Automatic;
328328
};
329329
183FDA6F1E7510920085589F = {
330330
CreatedOnToolsVersion = 8.2.1;
331+
LastSwiftMigration = 0900;
331332
ProvisioningStyle = Automatic;
332333
};
333334
183FDA841E7510F00085589F = {
334335
CreatedOnToolsVersion = 8.2.1;
336+
LastSwiftMigration = 0900;
335337
ProvisioningStyle = Automatic;
336338
};
337339
183FDA971E7510F10085589F = {
338340
CreatedOnToolsVersion = 8.2.1;
341+
LastSwiftMigration = 0900;
339342
ProvisioningStyle = Automatic;
340343
TestTargetID = 183FDA841E7510F00085589F;
341344
};
@@ -418,9 +421,12 @@
418421
files = (
419422
);
420423
inputPaths = (
424+
"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh",
425+
"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
421426
);
422427
name = "[CP] Embed Pods Frameworks";
423428
outputPaths = (
429+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
424430
);
425431
runOnlyForDeploymentPostprocessing = 0;
426432
shellPath = /bin/sh;
@@ -433,13 +439,16 @@
433439
files = (
434440
);
435441
inputPaths = (
442+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
443+
"${PODS_ROOT}/Manifest.lock",
436444
);
437445
name = "[CP] Check Pods Manifest.lock";
438446
outputPaths = (
447+
"$(DERIVED_FILE_DIR)/Pods-Demo-checkManifestLockResult.txt",
439448
);
440449
runOnlyForDeploymentPostprocessing = 0;
441450
shellPath = /bin/sh;
442-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
451+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
443452
showEnvVarsInLog = 0;
444453
};
445454
/* End PBXShellScriptBuildPhase section */
@@ -496,10 +505,10 @@
496505
target = 183FDA841E7510F00085589F /* Demo */;
497506
targetProxy = 183FDA991E7510F10085589F /* PBXContainerItemProxy */;
498507
};
499-
183FDABC1E759E0F0085589F /* PBXTargetDependency */ = {
508+
48D53DA91F72346A00FDB105 /* PBXTargetDependency */ = {
500509
isa = PBXTargetDependency;
501510
target = 183FDA661E7510920085589F /* StudyplusSDK */;
502-
targetProxy = 183FDABB1E759E0F0085589F /* PBXContainerItemProxy */;
511+
targetProxy = 48D53DA81F72346A00FDB105 /* PBXContainerItemProxy */;
503512
};
504513
/* End PBXTargetDependency section */
505514

@@ -532,15 +541,21 @@
532541
CLANG_CXX_LIBRARY = "libc++";
533542
CLANG_ENABLE_MODULES = YES;
534543
CLANG_ENABLE_OBJC_ARC = YES;
544+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
535545
CLANG_WARN_BOOL_CONVERSION = YES;
546+
CLANG_WARN_COMMA = YES;
536547
CLANG_WARN_CONSTANT_CONVERSION = YES;
537548
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
538549
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
539550
CLANG_WARN_EMPTY_BODY = YES;
540551
CLANG_WARN_ENUM_CONVERSION = YES;
541552
CLANG_WARN_INFINITE_RECURSION = YES;
542553
CLANG_WARN_INT_CONVERSION = YES;
554+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
555+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
543556
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
557+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
558+
CLANG_WARN_STRICT_PROTOTYPES = YES;
544559
CLANG_WARN_SUSPICIOUS_MOVE = YES;
545560
CLANG_WARN_UNREACHABLE_CODE = YES;
546561
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -571,6 +586,7 @@
571586
SDKROOT = iphoneos;
572587
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
573588
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
589+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
574590
TARGETED_DEVICE_FAMILY = "1,2";
575591
VERSIONING_SYSTEM = "apple-generic";
576592
VERSION_INFO_PREFIX = "";
@@ -586,15 +602,21 @@
586602
CLANG_CXX_LIBRARY = "libc++";
587603
CLANG_ENABLE_MODULES = YES;
588604
CLANG_ENABLE_OBJC_ARC = YES;
605+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
589606
CLANG_WARN_BOOL_CONVERSION = YES;
607+
CLANG_WARN_COMMA = YES;
590608
CLANG_WARN_CONSTANT_CONVERSION = YES;
591609
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
592610
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
593611
CLANG_WARN_EMPTY_BODY = YES;
594612
CLANG_WARN_ENUM_CONVERSION = YES;
595613
CLANG_WARN_INFINITE_RECURSION = YES;
596614
CLANG_WARN_INT_CONVERSION = YES;
615+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
616+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
597617
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
618+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
619+
CLANG_WARN_STRICT_PROTOTYPES = YES;
598620
CLANG_WARN_SUSPICIOUS_MOVE = YES;
599621
CLANG_WARN_UNREACHABLE_CODE = YES;
600622
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -617,6 +639,7 @@
617639
OTHER_SWIFT_FLAGS = "-D RELEASE";
618640
SDKROOT = iphoneos;
619641
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
642+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
620643
TARGETED_DEVICE_FAMILY = "1,2";
621644
VALIDATE_PRODUCT = YES;
622645
VERSIONING_SYSTEM = "apple-generic";
@@ -629,7 +652,7 @@
629652
buildSettings = {
630653
CLANG_ENABLE_MODULES = YES;
631654
CODE_SIGN_IDENTITY = "";
632-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
655+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
633656
DEFINES_MODULE = YES;
634657
DEVELOPMENT_TEAM = "";
635658
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -647,7 +670,8 @@
647670
PRODUCT_NAME = "$(TARGET_NAME)";
648671
SKIP_INSTALL = YES;
649672
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
650-
SWIFT_VERSION = 3.0;
673+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
674+
SWIFT_VERSION = 4.0;
651675
};
652676
name = Debug;
653677
};
@@ -672,7 +696,8 @@
672696
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDK;
673697
PRODUCT_NAME = "$(TARGET_NAME)";
674698
SKIP_INSTALL = YES;
675-
SWIFT_VERSION = 3.0;
699+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
700+
SWIFT_VERSION = 4.0;
676701
};
677702
name = Release;
678703
};
@@ -684,7 +709,8 @@
684709
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
685710
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
686711
PRODUCT_NAME = "$(TARGET_NAME)";
687-
SWIFT_VERSION = 3.0;
712+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
713+
SWIFT_VERSION = 4.0;
688714
};
689715
name = Debug;
690716
};
@@ -696,15 +722,16 @@
696722
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
697723
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
698724
PRODUCT_NAME = "$(TARGET_NAME)";
699-
SWIFT_VERSION = 3.0;
725+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
726+
SWIFT_VERSION = 4.0;
700727
};
701728
name = Release;
702729
};
703730
183FDAA01E7510F10085589F /* Debug */ = {
704731
isa = XCBuildConfiguration;
705732
baseConfigurationReference = 89218006880625385A599621 /* Pods-Demo.debug.xcconfig */;
706733
buildSettings = {
707-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
734+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
708735
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
709736
DEVELOPMENT_TEAM = "";
710737
INFOPLIST_FILE = Demo/Info.plist;
@@ -713,15 +740,16 @@
713740
OTHER_SWIFT_FLAGS = "$(inherited)";
714741
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
715742
PRODUCT_NAME = "$(TARGET_NAME)";
716-
SWIFT_VERSION = 3.0;
743+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
744+
SWIFT_VERSION = 4.0;
717745
};
718746
name = Debug;
719747
};
720748
183FDAA11E7510F10085589F /* Release */ = {
721749
isa = XCBuildConfiguration;
722750
baseConfigurationReference = 617BD1B3D302AA6EB05AD450 /* Pods-Demo.release.xcconfig */;
723751
buildSettings = {
724-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
752+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
725753
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
726754
DEVELOPMENT_TEAM = "";
727755
INFOPLIST_FILE = Demo/Info.plist;
@@ -730,7 +758,8 @@
730758
OTHER_SWIFT_FLAGS = "$(inherited)";
731759
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
732760
PRODUCT_NAME = "$(TARGET_NAME)";
733-
SWIFT_VERSION = 3.0;
761+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
762+
SWIFT_VERSION = 4.0;
734763
};
735764
name = Release;
736765
};
@@ -744,7 +773,8 @@
744773
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
745774
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
746775
PRODUCT_NAME = "$(TARGET_NAME)";
747-
SWIFT_VERSION = 3.0;
776+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
777+
SWIFT_VERSION = 4.0;
748778
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
749779
};
750780
name = Debug;
@@ -759,7 +789,8 @@
759789
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
760790
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
761791
PRODUCT_NAME = "$(TARGET_NAME)";
762-
SWIFT_VERSION = 3.0;
792+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
793+
SWIFT_VERSION = 4.0;
763794
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
764795
};
765796
name = Release;

0 commit comments

Comments
 (0)