Merge pull request #18 from studyplus/stop_support_ios8

masashi-sutou · web-flow · commit c4bb039ad9f6 · 2019-09-24T16:58:48.000+09:00
Stop support ios8
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+2.0.0 Release notes (2019-09-24)
+=============================================================
+
+### API Breaking Changes
+
+* Stoped support iOS8.
+* LSApplicationQueriesSchemes is always required to see if studyplus is installed. Please check README.md.
+
+### Enhancements
+
+* None.
+
+### Bugfixes
+
+* Fixed to check if studyplus is installed.
+
 1.3.6 Release notes (2019-08-30)
 =============================================================
 
diff --git a/Demo/AppDelegate.swift b/Demo/AppDelegate.swift
@@ -51,15 +51,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillTerminate(_ application: UIApplication) {
     }
 
-    // MARK: - iOS8
-
-    func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
-        print("-- called application(_:open:sourceApplication:annotation:) --")
-        return Studyplus.shared.handle(appDelegateUrl: url)
-    }
-
-    // MARK: - iOS9 or above
-
     func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
         print("-- called application(_:open:options:) --")
         return Studyplus.shared.handle(appDelegateUrl: url)
diff --git a/Demo/Info.plist b/Demo/Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>studyplus</string>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -15,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.6</string>
+	<string>2.0.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
diff --git a/Podfile b/Podfile
@@ -1,4 +1,4 @@
-platform :ios, '8.0'
+platform :ios, '9.0'
 
 use_frameworks!
 
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ StudyplusSDK-V2 is [Studyplus iOS SDK](https://github.com/studyplus/Studyplus-iO
 
 ## Requirements
 
- * iOS 8.0 or above
+ * iOS 9.0 or above
  * Swift 4.0 or above
 
 ## Dependency
@@ -33,17 +33,17 @@ github "studyplus/Studyplus-iOS-SDK-V2"
 
 - If you don't have consumerKey and consumerSecret, please contact https://info.studyplus.co.jp/contact/studyplus-api
 
-### Set up custom URL scheme
+### ① Set up custom URL scheme
 
 - set __studyplus-*{your consumer key}*__ to URL Types. (ex. studyplus-MIoh79q7pfMbTUVA3BNsSeTaZRcOK3yg )
 
 ![xcode](https://github.com/studyplus/Studyplus-iOS-SDK-V2/blob/master/docs/set_url_scheme.png)
 
-### Set up consumerKey and consumerSecret
+### ② Set up consumerKey and consumerSecret
 
 - set __consumerKey__ and __consumerSecret__ in your Info.plist.
 
-```plist
+```
 <key>StudyplusSDK</key>
 <dict>
   <key>consumerKey</key>
@@ -53,6 +53,17 @@ github "studyplus/Studyplus-iOS-SDK-V2"
 </dict>
 ```
 
+### ③ Set up LSApplicationQueriesSchemes
+
+- Set LSApplicationQueriesSchemes in your info.plist for checking if studyplus is installed.
+
+```
+<key>LSApplicationQueriesSchemes</key>
+<array>
+  <string>studyplus</string>
+</array>
+```
+
 ### Initialize
 
 ```Swift
@@ -79,16 +90,6 @@ import StudyplusSDK_V2
 
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-    // ...
-
-    // MARK: - iOS8
-
-    func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
-        return Studyplus.shared.handle(appDelegateUrl: url)
-    }
-
-    // MARK: - iOS9 or above
-
     func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
         return Studyplus.shared.handle(appDelegateUrl: url)
     }
diff --git a/StudyplusSDK-V2.podspec b/StudyplusSDK-V2.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name                  = "StudyplusSDK-V2"
-  s.version               = "1.3.6"
+  s.version               = "2.0.0"
   s.summary               = "StudyplusSDK-V2 is Studyplus iOS SDK for Swift"
   s.homepage              = "https://info.studyplus.jp"
   s.license               = { :type => "MIT", :file => "LICENSE" }
   s.source                = { :git => "https://github.com/studyplus/Studyplus-iOS-SDK-V2.git", :tag => s.version }
   s.source_files          = "StudyplusSDK", "StudyplusSDK/**/*.{swift}"
   s.requires_arc          = true
-  s.platform              = :ios, '8.0'
-  s.ios.deployment_target = '8.0'
+  s.platform              = :ios, '9.0'
+  s.ios.deployment_target = '9.0'
   s.ios.frameworks        = ['UIKit', 'Foundation']
   s.author                = { 'Studyplus inc' => 'developer-all@studyplus.jp' }
   s.swift_versions        = ['4.2', '5.0']
diff --git a/StudyplusSDK.xcodeproj/project.pbxproj b/StudyplusSDK.xcodeproj/project.pbxproj
@@ -655,6 +655,7 @@
 				);
 				INFOPLIST_FILE = StudyplusSDK/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDK;
@@ -682,6 +683,7 @@
 				);
 				INFOPLIST_FILE = StudyplusSDK/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.StudyplusSDK;
@@ -723,7 +725,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
@@ -740,7 +742,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Demo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.studyplus.Demo;
diff --git a/StudyplusSDK/Info.plist b/StudyplusSDK/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.6</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/StudyplusSDK/Studyplus.swift b/StudyplusSDK/Studyplus.swift
@@ -41,7 +41,7 @@ final public class Studyplus {
      
      StudyplusSDKのバージョンを返します
      */
-    public static let SDKVersion: String = "1.3.6"
+    public static let SDKVersion: String = "2.0.0"
     
     /**
      Returns the shared defaults object.
@@ -75,25 +75,16 @@ final public class Studyplus {
      see StudyplusLoginDelegate protocol
      */
     public weak var delegate: StudyplusLoginDelegate?
-
-    /**
-     When set to true, if Studyplus is not installed, AppStore starts when auth/login methods are called.
-
-     trueの場合、auth、loginメソッドを呼び出したとき、StudyplusアプリがインストールされていなければAppStoreを起動します。
-     */
-    public var openAppStoreIfNotInstalled: Bool = true
     
     private let accessTokenStoreKey: String = "accessToken"
     private let usernameStoreKey: String = "username"
     
     /// Opens the login screen by invoking the Studyplus application.
-    /// If Studyplus app is not installed and openAppStoreIfNotInstalled is true, then open the Studyplus page in AppStore.
-    /// If openAppStoreIfNotInstalled is false, do nothing.
+    /// If Studyplus app is not installed, open the Studyplus page in AppStore.
     /// After the process has returned from Studyplus application, delegate method will be called back.
     ///
     /// Studyplusアプリを起動してStudyplusログイン画面を開きます。
-    /// Studyplusアプリがインストールされていない場合、 openAppStoreIfNotInstalled が true であれば、AppStore を起動して Studyplus を開きます。
-    /// openAppStoreIfNotInstalled が false であれば何もしません。
+    /// Studyplusアプリがインストールされていない場合、AppStore を起動して Studyplus を開きます。
     /// Studyplusアプリから操作が戻ってきた後、delegateオブジェクトのコールバックメソッドを呼び出します。
     public func login() {
         openStudyplus(command: "auth")
@@ -299,20 +290,18 @@ final public class Studyplus {
     
     private func openStudyplus(command: String) {
         
+        guard UIApplication.shared.canOpenURL(URL(string: "studyplus://")!) else {
+            let appStoreURLString: String = "https://apps.apple.com/jp/app/id505410049?mt=8"
+            guard let appStoreURL = URL(string: appStoreURLString) else { return }
+            applicationOpen(appStoreURL)
+            return
+        }
+        
         let urlString: String = "studyplus://external_app/" + command + "/" + consumerKey + "/" + consumerSecret
 
         if let url = URL(string: urlString) {
         
             applicationOpen(url)
-
-        } else {
-            
-            if self.openAppStoreIfNotInstalled {
-            
-                let appStoreURLString: String = "https://apps.apple.com/jp/app/id505410049?mt=8"
-                guard let appStoreURL = URL(string: appStoreURLString) else { return }
-                applicationOpen(appStoreURL)
-            }
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-platform :ios, '8.0'`
	`1`	`+platform :ios, '9.0'`
`2`	`2`
`3`	`3`	`use_frameworks!`
`4`	`4`