From 19ef23b0775b3416e2b54462fe9ebd82d24ee13f Mon Sep 17 00:00:00 2001 From: onevcat Date: Wed, 18 Aug 2021 16:22:22 +0900 Subject: [PATCH 1/4] Upgrade project setting --- LineSDK/LineSDK.xcodeproj/project.pbxproj | 2 +- .../LineSDK.xcodeproj/xcshareddata/xcschemes/LineSDK.xcscheme | 2 +- .../xcshareddata/xcschemes/LineSDKObjC.xcscheme | 2 +- .../xcshareddata/xcschemes/LineSDKObjCBinary.xcscheme | 2 +- LineSDKSample/LineSDKSample.xcodeproj/project.pbxproj | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/LineSDK/LineSDK.xcodeproj/project.pbxproj b/LineSDK/LineSDK.xcodeproj/project.pbxproj index c9d665ab..3c57505a 100644 --- a/LineSDK/LineSDK.xcodeproj/project.pbxproj +++ b/LineSDK/LineSDK.xcodeproj/project.pbxproj @@ -2091,7 +2091,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0940; - LastUpgradeCheck = 1200; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = "LINE Corp"; TargetAttributes = { 4B6A702D2109793500D71C66 = { diff --git a/LineSDK/LineSDK.xcodeproj/xcshareddata/xcschemes/LineSDK.xcscheme b/LineSDK/LineSDK.xcodeproj/xcshareddata/xcschemes/LineSDK.xcscheme index ef184b04..994a5eca 100644 --- a/LineSDK/LineSDK.xcodeproj/xcshareddata/xcschemes/LineSDK.xcscheme +++ b/LineSDK/LineSDK.xcodeproj/xcshareddata/xcschemes/LineSDK.xcscheme @@ -1,6 +1,6 @@ Date: Wed, 18 Aug 2021 16:22:54 +0900 Subject: [PATCH 2/4] Upgrade gem versions --- Gemfile.lock | 169 +++++++++++++++++++++++++++------------------------ 1 file changed, 90 insertions(+), 79 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 33b812a2..2e3f371e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,40 +2,40 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.4.4) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.1.0) - aws-partitions (1.422.0) - aws-sdk-core (3.111.2) + aws-eventstream (1.1.1) + aws-partitions (1.488.0) + aws-sdk-core (3.119.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.46.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.99.0) + aws-sdk-core (~> 3, >= 3.119.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.0.3) - cocoapods (1.10.1) + cocoapods (1.10.2) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.1) + cocoapods-core (= 1.10.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -50,7 +50,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.1) + cocoapods-core (1.10.2) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -60,52 +60,65 @@ GEM netrc (~> 0.11) public_suffix typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) + cocoapods-deintegrate (1.0.5) cocoapods-downloader (1.4.0) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) + cocoapods-search (1.0.1) cocoapods-trunk (1.5.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored (1.2) colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) - concurrent-ruby (1.1.8) + commander (4.6.0) + highline (~> 2.0.0) + concurrent-ruby (1.1.9) declarative (0.0.20) - declarative-option (0.1.0) - digest-crc (0.6.3) + digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) - emoji_regex (3.2.1) + emoji_regex (3.2.2) escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - excon (0.78.1) - faraday (1.3.0) + ethon (0.14.0) + ffi (>= 1.15.0) + excon (0.85.0) + faraday (1.7.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday_middleware (1.0.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday_middleware (1.1.0) faraday (~> 1.0) - fastimage (2.2.2) - fastlane (2.172.0) + fastimage (2.2.5) + fastlane (2.191.0) CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) + addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored - commander-fastlane (>= 4.4.6, < 5.0.0) + commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -114,18 +127,19 @@ GEM faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.37.0, < 0.39.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (~> 2.0.0) + naturally (~> 2.2) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) @@ -134,77 +148,73 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-changelog (0.15.0) - ffi (1.14.2) + fastlane-plugin-changelog (0.16.0) + ffi (1.15.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-api-client (0.38.0) + google-apis-androidpublisher_v3 (0.10.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-core (0.4.1) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) - google-apis-core (0.2.1) - addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.14) - httpclient (>= 2.8.1, < 3.0) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) + retriable (>= 2.0, < 4.a) rexml - signet (~> 0.14) webrick - google-apis-iamcredentials_v1 (0.1.0) - google-apis-core (~> 0.1) - google-apis-storage_v1 (0.1.0) - google-apis-core (~> 0.1) - google-cloud-core (1.5.0) + google-apis-iamcredentials_v1 (0.6.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-playcustomapp_v1 (0.5.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-storage_v1 (0.6.0) + google-apis-core (>= 0.4, < 2.a) + google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.4.0) + google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.1) - google-cloud-storage (1.30.0) + google-cloud-errors (1.1.0) + google-cloud-storage (1.34.1) addressable (~> 2.5) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.15.0) + googleauth (0.17.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.14) - highline (1.7.10) - http-cookie (1.0.3) + highline (2.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.8.7) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jazzy (0.13.6) + jazzy (0.14.0) cocoapods (~> 1.5) mustache (~> 1.1) - open4 + open4 (~> 1.3) redcarpet (~> 3.4) + rexml (~> 3.2) rouge (>= 2.0.6, < 4.0) sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) jmespath (1.4.0) json (2.5.1) - jwt (2.2.2) + jwt (2.2.3) liferaft (0.0.6) memoist (0.16.2) mini_magick (4.11.0) - mini_mime (1.0.2) - minitest (5.14.3) + mini_mime (1.1.0) + minitest (5.14.4) molinillo (0.6.6) multi_json (1.15.0) multipart-post (2.0.0) @@ -217,22 +227,22 @@ GEM os (1.1.1) plist (3.6.0) public_suffix (4.0.6) - rake (13.0.3) + rake (13.0.6) redcarpet (3.5.1) - representable (3.0.4) + representable (3.1.1) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.4) + rexml (3.2.5) rouge (2.0.7) ruby-macho (1.4.0) - ruby2_keywords (0.0.4) - rubyzip (2.3.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) security (0.1.3) - signet (0.14.1) + signet (0.15.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) @@ -240,12 +250,12 @@ GEM simctl (1.6.8) CFPropertyList naturally - slack-notifier (2.3.2) sqlite3 (1.4.2) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) + trailblazer-option (0.1.1) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) @@ -263,15 +273,16 @@ GEM word_wrap (1.0.0) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcode-install (2.6.8) + xcode-install (2.7.0) claide (>= 0.9.1, < 1.1.0) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.19.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) From 9bab6985ecbca23d266f07b4f788673fc7c94c6f Mon Sep 17 00:00:00 2001 From: onevcat Date: Wed, 18 Aug 2021 16:32:28 +0900 Subject: [PATCH 3/4] Add Open Chat Plug related permissions --- LineSDK/LineSDK/Login/LoginPermission.swift | 10 ++++++ .../Login/LineSDKLoginPermission.swift | 36 +++++++++++-------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/LineSDK/LineSDK/Login/LoginPermission.swift b/LineSDK/LineSDK/Login/LoginPermission.swift index d2b0600e..6093e5c5 100644 --- a/LineSDK/LineSDK/Login/LoginPermission.swift +++ b/LineSDK/LineSDK/Login/LoginPermission.swift @@ -99,6 +99,16 @@ extension LoginPermission { public static let realName = LoginPermission(rawValue: "real_name") } +/// :nodoc: +/// LINE internal use only. Sub-permissions of Open Chat Plug. +extension LoginPermission { + public static let openChatPlugManagement = LoginPermission(rawValue: "openchatplug.managament") + public static let openChatPlugInfo = LoginPermission(rawValue: "openchatplug.info") + public static let openChatPlugProfile = LoginPermission(rawValue: "openchatplug.profile") + public static let openChatPlugSendMessage = LoginPermission(rawValue: "openchatplug.send.message") + public static let openChatPlugReceiveMessageEvent = LoginPermission(rawValue: "openchatplug.receive.message.and.event") +} + /// :nodoc: extension LoginPermission: CustomStringConvertible { public var description: String { return rawValue } diff --git a/LineSDK/LineSDKObjC/Login/LineSDKLoginPermission.swift b/LineSDK/LineSDKObjC/Login/LineSDKLoginPermission.swift index 63276346..c1c77714 100644 --- a/LineSDK/LineSDKObjC/Login/LineSDKLoginPermission.swift +++ b/LineSDK/LineSDKObjC/Login/LineSDKLoginPermission.swift @@ -34,23 +34,29 @@ public class LineSDKLoginPermission: NSObject { return Set(permissions) } - public static let openID = LineSDKLoginPermission(.openID) - public static let profile = LineSDKLoginPermission(.profile) - public static let friends = LineSDKLoginPermission(.friends) - public static let groups = LineSDKLoginPermission(.groups) - public static let oneTimeShare = LineSDKLoginPermission(.oneTimeShare) - public static let messageWrite = LineSDKLoginPermission(.messageWrite) + public static let openID = LineSDKLoginPermission(.openID) + public static let profile = LineSDKLoginPermission(.profile) + public static let friends = LineSDKLoginPermission(.friends) + public static let groups = LineSDKLoginPermission(.groups) + public static let oneTimeShare = LineSDKLoginPermission(.oneTimeShare) + public static let messageWrite = LineSDKLoginPermission(.messageWrite) - public static let email = LineSDKLoginPermission(.email) - public static let phone = LineSDKLoginPermission(.phone) - public static let gender = LineSDKLoginPermission(.gender) - public static let birthdate = LineSDKLoginPermission(.birthdate) - public static let address = LineSDKLoginPermission(.address) - public static let realName = LineSDKLoginPermission(.realName) + public static let email = LineSDKLoginPermission(.email) + public static let phone = LineSDKLoginPermission(.phone) + public static let gender = LineSDKLoginPermission(.gender) + public static let birthdate = LineSDKLoginPermission(.birthdate) + public static let address = LineSDKLoginPermission(.address) + public static let realName = LineSDKLoginPermission(.realName) - public static let openChatTermStatus = LineSDKLoginPermission(.openChatTermStatus) - public static let openChatRoomCreateAndJoin = LineSDKLoginPermission(.openChatRoomCreateAndJoin) - public static let openChatInfo = LineSDKLoginPermission(.openChatInfo) + public static let openChatTermStatus = LineSDKLoginPermission(.openChatTermStatus) + public static let openChatRoomCreateAndJoin = LineSDKLoginPermission(.openChatRoomCreateAndJoin) + public static let openChatInfo = LineSDKLoginPermission(.openChatInfo) + + public static let openChatPlugManagement = LineSDKLoginPermission(.openChatPlugManagement) + public static let openChatPlugInfo = LineSDKLoginPermission(.openChatPlugInfo) + public static let openChatPlugProfile = LineSDKLoginPermission(.openChatPlugProfile) + public static let openChatPlugSendMessage = LineSDKLoginPermission(.openChatPlugSendMessage) + public static let openChatPlugReceiveMessageEvent = LineSDKLoginPermission(.openChatPlugReceiveMessageEvent) var unwrapped: LoginPermission { return _value } } From 59043a2ce15189c389beb534749ae16e3bec9c59 Mon Sep 17 00:00:00 2001 From: onevcat Date: Thu, 19 Aug 2021 09:59:21 +0900 Subject: [PATCH 4/4] Update change log --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2fe9c52..3c0a3fff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added + +- New permissions in `LoginPermission` for Open Chat Plug features. [#168](https://github.com/line/line-sdk-ios-swift/pull/168) + ## [5.7.0] - 2020-09-16 ### Added