Skip to content

Commit 19ded47

Browse files
masashi-sutoumasashi-sutou
authored
Merge pull request #6 from studyplus/build_xcode93
Build Xcode9.4.1
2 parents c14f2b3 + 71359d7 commit 19ded47

File tree

13 files changed

+63
-36
lines changed

13 files changed

+63
-36
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
1.2.0 Release notes (2018-07-02)
2+
=============================================================
3+
4+
### API Breaking Changes
5+
6+
* None.
7+
8+
### Enhancements
9+
10+
* None.
11+
12+
### Bugfixes
13+
14+
* fail to post study record when 24 hour system setting is invalid.
15+
116
1.1.1 Release notes (2017-11-14)
217
=============================================================
318

‎Cartfile

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

‎Cartfile.resolved

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

‎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.1.1</string>
18+
<string>1.2.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.1.0'
6+
pod 'KeychainAccess', '3.1.1'
77
end

‎Podfile.lock

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

44
DEPENDENCIES:
5-
- KeychainAccess (= 3.1.0)
5+
- KeychainAccess (= 3.1.1)
6+
7+
SPEC REPOS:
8+
https://github.com/cocoapods/specs.git:
9+
- KeychainAccess
610

711
SPEC CHECKSUMS:
8-
KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da
12+
KeychainAccess: 7bd430028059754a3debab3cfc0bd1fc7fb85df3
913

10-
PODFILE CHECKSUM: 5d59a864df1b8c7fb07b7cc4f11a87235ba9692c
14+
PODFILE CHECKSUM: 252d5377b931f703238854e56df200aab4d237d9
1115

12-
COCOAPODS: 1.3.1
16+
COCOAPODS: 1.5.3

‎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.1.1"
3+
s.version = "1.2.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.1.0'
14+
s.dependency 'KeychainAccess', '3.1.1'
1515
end
1616

‎StudyplusSDK.xcodeproj/project.pbxproj

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@
280280
183FDA821E7510F00085589F /* Frameworks */,
281281
183FDA831E7510F00085589F /* Resources */,
282282
764BEF1941D689B54DF91C96 /* [CP] Embed Pods Frameworks */,
283-
0D84BAE00562247D34CA7850 /* [CP] Copy Pods Resources */,
284283
48D53DAA1F72346A00FDB105 /* Embed Frameworks */,
285284
);
286285
buildRules = (
@@ -318,7 +317,7 @@
318317
isa = PBXProject;
319318
attributes = {
320319
LastSwiftUpdateCheck = 0820;
321-
LastUpgradeCheck = 0900;
320+
LastUpgradeCheck = 0930;
322321
ORGANIZATIONNAME = studyplus;
323322
TargetAttributes = {
324323
183FDA661E7510920085589F = {
@@ -400,21 +399,6 @@
400399
/* End PBXResourcesBuildPhase section */
401400

402401
/* Begin PBXShellScriptBuildPhase section */
403-
0D84BAE00562247D34CA7850 /* [CP] Copy Pods Resources */ = {
404-
isa = PBXShellScriptBuildPhase;
405-
buildActionMask = 2147483647;
406-
files = (
407-
);
408-
inputPaths = (
409-
);
410-
name = "[CP] Copy Pods Resources";
411-
outputPaths = (
412-
);
413-
runOnlyForDeploymentPostprocessing = 0;
414-
shellPath = /bin/sh;
415-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-resources.sh\"\n";
416-
showEnvVarsInLog = 0;
417-
};
418402
764BEF1941D689B54DF91C96 /* [CP] Embed Pods Frameworks */ = {
419403
isa = PBXShellScriptBuildPhase;
420404
buildActionMask = 2147483647;
@@ -545,13 +529,15 @@
545529
CLANG_WARN_BOOL_CONVERSION = YES;
546530
CLANG_WARN_COMMA = YES;
547531
CLANG_WARN_CONSTANT_CONVERSION = YES;
532+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
548533
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
549534
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
550535
CLANG_WARN_EMPTY_BODY = YES;
551536
CLANG_WARN_ENUM_CONVERSION = YES;
552537
CLANG_WARN_INFINITE_RECURSION = YES;
553538
CLANG_WARN_INT_CONVERSION = YES;
554539
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
540+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
555541
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
556542
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
557543
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -606,13 +592,15 @@
606592
CLANG_WARN_BOOL_CONVERSION = YES;
607593
CLANG_WARN_COMMA = YES;
608594
CLANG_WARN_CONSTANT_CONVERSION = YES;
595+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
609596
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
610597
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
611598
CLANG_WARN_EMPTY_BODY = YES;
612599
CLANG_WARN_ENUM_CONVERSION = YES;
613600
CLANG_WARN_INFINITE_RECURSION = YES;
614601
CLANG_WARN_INT_CONVERSION = YES;
615602
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
603+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
616604
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
617605
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
618606
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎StudyplusSDK.xcodeproj/xcshareddata/xcschemes/StudyplusSDK.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 = "0930"
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"

‎StudyplusSDK.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>

0 commit comments

Comments
 (0)