Skip to content

Commit d3ce41b

Browse files
masashi-sutoumasashi-sutou
authored
Merge pull request #8 from studyplus/add_change_key_and_secret
Consumer Key と Consumer Secret を動的に変更できるようにする
2 parents e71c92c + 3ea7472 commit d3ce41b

File tree

13 files changed

+98
-41
lines changed

13 files changed

+98
-41
lines changed

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
1.3.0 Release notes (2019-04-09)
2+
=============================================================
3+
4+
### API Breaking Changes
5+
6+
* None.
7+
8+
### Enhancements
9+
10+
* change the consumer key and secret.
11+
* You can call this method to switch to a different key when logging in to Studyplus or posting study records.
12+
* If multiple applications are connected with Studyplus, you need to call this method.
13+
* If there is only one connected application, you do not need to call this method.
14+
* Built with Xcode 10.2 & Swift 5.
15+
* Update library.
16+
17+
### Bugfixes
18+
19+
* None.
20+
121
1.2.1 Release notes (2019-01-15)
222
=============================================================
323

‎Cartfile

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

‎Cartfile.resolved

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

‎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.2.1</string>
18+
<string>1.3.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.2'
6+
pod 'KeychainAccess', '3.2.0'
77
end

‎Podfile.lock

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

44
DEPENDENCIES:
5-
- KeychainAccess (= 3.1.2)
5+
- KeychainAccess (= 3.2.0)
66

77
SPEC REPOS:
88
https://github.com/cocoapods/specs.git:
99
- KeychainAccess
1010

1111
SPEC CHECKSUMS:
12-
KeychainAccess: b3816fddcf28aa29d94b10ec305cd52be14c472b
12+
KeychainAccess: 3b1bf8a77eb4c6ea1ce9404c292e48f948954c6b
1313

14-
PODFILE CHECKSUM: a676396cbae51e5a6bac480d6b8d92b81dcc7ce4
14+
PODFILE CHECKSUM: 352692b69057b39cb68c163e0c65e32a69dd4b91
1515

16-
COCOAPODS: 1.5.3
16+
COCOAPODS: 1.6.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.2.1"
3+
s.version = "1.3.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,5 +11,5 @@ 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.2'
14+
s.dependency 'KeychainAccess', '3.2.0'
1515
end

‎StudyplusSDK.xcodeproj/project.pbxproj

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -317,35 +317,35 @@
317317
isa = PBXProject;
318318
attributes = {
319319
LastSwiftUpdateCheck = 0820;
320-
LastUpgradeCheck = 0930;
320+
LastUpgradeCheck = 1020;
321321
ORGANIZATIONNAME = studyplus;
322322
TargetAttributes = {
323323
183FDA661E7510920085589F = {
324324
CreatedOnToolsVersion = 8.2.1;
325-
LastSwiftMigration = 1000;
325+
LastSwiftMigration = 1020;
326326
ProvisioningStyle = Automatic;
327327
};
328328
183FDA6F1E7510920085589F = {
329329
CreatedOnToolsVersion = 8.2.1;
330-
LastSwiftMigration = 1000;
330+
LastSwiftMigration = 1020;
331331
ProvisioningStyle = Automatic;
332332
};
333333
183FDA841E7510F00085589F = {
334334
CreatedOnToolsVersion = 8.2.1;
335-
LastSwiftMigration = 1000;
335+
LastSwiftMigration = 1020;
336336
ProvisioningStyle = Automatic;
337337
};
338338
183FDA971E7510F10085589F = {
339339
CreatedOnToolsVersion = 8.2.1;
340-
LastSwiftMigration = 1000;
340+
LastSwiftMigration = 1020;
341341
ProvisioningStyle = Automatic;
342342
TestTargetID = 183FDA841E7510F00085589F;
343343
};
344344
};
345345
};
346346
buildConfigurationList = 183FDA611E7510920085589F /* Build configuration list for PBXProject "StudyplusSDK" */;
347347
compatibilityVersion = "Xcode 3.2";
348-
developmentRegion = English;
348+
developmentRegion = en;
349349
hasScannedForEncodings = 0;
350350
knownRegions = (
351351
en,
@@ -405,7 +405,7 @@
405405
files = (
406406
);
407407
inputPaths = (
408-
"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh",
408+
"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh",
409409
"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
410410
);
411411
name = "[CP] Embed Pods Frameworks";
@@ -414,7 +414,7 @@
414414
);
415415
runOnlyForDeploymentPostprocessing = 0;
416416
shellPath = /bin/sh;
417-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
417+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
418418
showEnvVarsInLog = 0;
419419
};
420420
B53884D9564CE4E4A42A331F /* [CP] Check Pods Manifest.lock */ = {
@@ -519,6 +519,7 @@
519519
183FDA791E7510920085589F /* Debug */ = {
520520
isa = XCBuildConfiguration;
521521
buildSettings = {
522+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
522523
ALWAYS_SEARCH_USER_PATHS = NO;
523524
CLANG_ANALYZER_NONNULL = YES;
524525
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -582,6 +583,7 @@
582583
183FDA7A1E7510920085589F /* Release */ = {
583584
isa = XCBuildConfiguration;
584585
buildSettings = {
586+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
585587
ALWAYS_SEARCH_USER_PATHS = NO;
586588
CLANG_ANALYZER_NONNULL = YES;
587589
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -638,6 +640,7 @@
638640
183FDA7C1E7510920085589F /* Debug */ = {
639641
isa = XCBuildConfiguration;
640642
buildSettings = {
643+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
641644
CLANG_ENABLE_MODULES = YES;
642645
CODE_SIGN_IDENTITY = "";
643646
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -658,13 +661,14 @@
658661
PRODUCT_NAME = "$(TARGET_NAME)";
659662
SKIP_INSTALL = YES;
660663
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
661-
SWIFT_VERSION = 4.2;
664+
SWIFT_VERSION = 5.0;
662665
};
663666
name = Debug;
664667
};
665668
183FDA7D1E7510920085589F /* Release */ = {
666669
isa = XCBuildConfiguration;
667670
buildSettings = {
671+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
668672
CLANG_ENABLE_MODULES = YES;
669673
CODE_SIGN_IDENTITY = "";
670674
DEFINES_MODULE = YES;
@@ -683,7 +687,7 @@
683687
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDK;
684688
PRODUCT_NAME = "$(TARGET_NAME)";
685689
SKIP_INSTALL = YES;
686-
SWIFT_VERSION = 4.2;
690+
SWIFT_VERSION = 5.0;
687691
};
688692
name = Release;
689693
};
@@ -695,7 +699,7 @@
695699
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
696700
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
697701
PRODUCT_NAME = "$(TARGET_NAME)";
698-
SWIFT_VERSION = 4.2;
702+
SWIFT_VERSION = 5.0;
699703
};
700704
name = Debug;
701705
};
@@ -707,15 +711,15 @@
707711
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
708712
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDKTests;
709713
PRODUCT_NAME = "$(TARGET_NAME)";
710-
SWIFT_VERSION = 4.2;
714+
SWIFT_VERSION = 5.0;
711715
};
712716
name = Release;
713717
};
714718
183FDAA01E7510F10085589F /* Debug */ = {
715719
isa = XCBuildConfiguration;
716720
baseConfigurationReference = 89218006880625385A599621 /* Pods-Demo.debug.xcconfig */;
717721
buildSettings = {
718-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
722+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
719723
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
720724
DEVELOPMENT_TEAM = "";
721725
INFOPLIST_FILE = Demo/Info.plist;
@@ -724,15 +728,15 @@
724728
OTHER_SWIFT_FLAGS = "$(inherited)";
725729
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
726730
PRODUCT_NAME = "$(TARGET_NAME)";
727-
SWIFT_VERSION = 4.2;
731+
SWIFT_VERSION = 5.0;
728732
};
729733
name = Debug;
730734
};
731735
183FDAA11E7510F10085589F /* Release */ = {
732736
isa = XCBuildConfiguration;
733737
baseConfigurationReference = 617BD1B3D302AA6EB05AD450 /* Pods-Demo.release.xcconfig */;
734738
buildSettings = {
735-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
739+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
736740
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
737741
DEVELOPMENT_TEAM = "";
738742
INFOPLIST_FILE = Demo/Info.plist;
@@ -741,36 +745,36 @@
741745
OTHER_SWIFT_FLAGS = "$(inherited)";
742746
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
743747
PRODUCT_NAME = "$(TARGET_NAME)";
744-
SWIFT_VERSION = 4.2;
748+
SWIFT_VERSION = 5.0;
745749
};
746750
name = Release;
747751
};
748752
183FDAA31E7510F10085589F /* Debug */ = {
749753
isa = XCBuildConfiguration;
750754
buildSettings = {
751-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
755+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
752756
BUNDLE_LOADER = "$(TEST_HOST)";
753757
INFOPLIST_FILE = DemoTests/Info.plist;
754758
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
755759
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
756760
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
757761
PRODUCT_NAME = "$(TARGET_NAME)";
758-
SWIFT_VERSION = 4.2;
762+
SWIFT_VERSION = 5.0;
759763
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
760764
};
761765
name = Debug;
762766
};
763767
183FDAA41E7510F10085589F /* Release */ = {
764768
isa = XCBuildConfiguration;
765769
buildSettings = {
766-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
770+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
767771
BUNDLE_LOADER = "$(TEST_HOST)";
768772
INFOPLIST_FILE = DemoTests/Info.plist;
769773
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
770774
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
771775
PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.DemoTests;
772776
PRODUCT_NAME = "$(TARGET_NAME)";
773-
SWIFT_VERSION = 4.2;
777+
SWIFT_VERSION = 5.0;
774778
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
775779
};
776780
name = Release;

‎StudyplusSDK.xcodeproj/project.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>

‎StudyplusSDK.xcodeproj/xcshareddata/xcschemes/StudyplusSDK.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 = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)