Skip to content

Commit 87ac6b1

Browse files
committed
Merge branch 'master' into add_change_key_and_secret
2 parents e9e7ce8 + e71c92c commit 87ac6b1

File tree

6 files changed

+25
-9
lines changed

6 files changed

+25
-9
lines changed

CHANGELOG.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1.3.0 Release notes (2018-08-21)
1+
1.3.0 Release notes (2019-XX-XX)
22
=============================================================
33

44
### API Breaking Changes
@@ -16,6 +16,22 @@
1616

1717
* None.
1818

19+
1.2.1 Release notes (2019-01-15)
20+
=============================================================
21+
22+
### API Breaking Changes
23+
24+
* None.
25+
26+
### Enhancements
27+
28+
* Built with Xcode 10 & Swift 4.2.
29+
* Update library.
30+
31+
### Bugfixes
32+
33+
* None.
34+
1935
1.2.0 Release notes (2018-07-02)
2036
=============================================================
2137

Cartfile

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

Cartfile.resolved

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

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.1'
6+
pod 'KeychainAccess', '3.1.2'
77
end

Podfile.lock

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

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

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

1111
SPEC CHECKSUMS:
12-
KeychainAccess: 7bd430028059754a3debab3cfc0bd1fc7fb85df3
12+
KeychainAccess: b3816fddcf28aa29d94b10ec305cd52be14c472b
1313

14-
PODFILE CHECKSUM: 252d5377b931f703238854e56df200aab4d237d9
14+
PODFILE CHECKSUM: a676396cbae51e5a6bac480d6b8d92b81dcc7ce4
1515

1616
COCOAPODS: 1.5.3

StudyplusSDK-V2.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.1'
14+
s.dependency 'KeychainAccess', '3.1.2'
1515
end

0 commit comments

Comments
 (0)