Merge pull request #2 from studyplus/fix_minor_changes

Fix minor changes

Author: masashi-sutou

Demo/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.8</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Podfile.lock

@@ -9,4 +9,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 99cb6e8dd53026dd13517c24451af319e5c1a23a
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.2.1

StudyplusSDK-V2.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "StudyplusSDK-V2"
-  s.version               = "1.0.7"
+  s.version               = "1.0.8"
   s.summary               = "StudyplusSDK-V2 is Studyplus iOS SDK for Swift"
   s.homepage              = "http://info.studyplus.jp"
   s.license               = { :type => "MIT", :file => "LICENSE" }

StudyplusSDK.xcodeproj/project.pbxproj

@@ -439,7 +439,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

StudyplusSDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.8</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

StudyplusSDK/StudyplusAPIRequest.swift

@@ -61,7 +61,6 @@ internal struct StudyplusAPIRequest {
 
         guard let url = buildUrl(path: path) else { return }
 
-        let urlSession = URLSession(configuration: URLSessionConfiguration.default)
         var request = URLRequest(url: url)
         request.httpMethod = method
 
@@ -74,8 +73,12 @@ internal struct StudyplusAPIRequest {
         }
 
         request.addValue("OAuth " + accessToken, forHTTPHeaderField: "HTTP_AUTHORIZATION")
-        
+
+        let urlSession = URLSession(configuration: URLSessionConfiguration.default)
         let task = urlSession.dataTask(with: request) { (data, response, error) in
+            
+            urlSession.finishTasksAndInvalidate()
+            
             if error == nil && response != nil {
                 if let httpResponse: HTTPURLResponse = response as? HTTPURLResponse {
                     if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 || httpResponse.statusCode == 202 {

StudyplusSDK/StudyplusRecord.swift

@@ -43,6 +43,7 @@ private extension Date {
     }
 
     func string(format: String = "yyyy-MM-dd'T'HH:mm:ssZ") -> String {
+        formatter.locale = Locale.current
         formatter.dateFormat = format
         return formatter.string(from: self)
     }
@@ -59,27 +60,27 @@ public struct StudyplusRecord {
      The seconds of the learning.
      勉強した時間（秒数）です。
      */
-    public private(set) var duration: Double
+    public let duration: Double
 
     /**
      The date and time of learning.
      勉強した日時です。
      */
-    public private(set) var recordedAt: Date
+    public let recordedAt: Date
 
     /**
      The amount of learning.
      勉強した量です。
 
      see StudyplusRecordAmount
      */
-     public private(set) var amount: StudyplusRecordAmount?
+     public let amount: StudyplusRecordAmount?
 
     /**
      The comment of learning.
      勉強に関するコメントです。
      */
-     public private(set) var comment: String?
+     public let comment: String?
 
     /// Initialize StudyplusRecord object.
     ///

StudyplusSDK/StudyplusRecordAmount.swift

@@ -38,14 +38,14 @@ public struct StudyplusRecordAmount {
 
      学習量
      */
-    public private(set) var amount: UInt?
+    public let amount: UInt?
 
     /**
      Range of learning amount.
 
      学習範囲
      */
-    public private(set) var range: (from: UInt, to: UInt)?
+    public let range: (from: UInt, to: UInt)?
 
     /// Initialize the Amount object with only the total amount of learning.
     ///
@@ -54,6 +54,7 @@ public struct StudyplusRecordAmount {
     /// - Parameter amount: learning amount. 学習量。
     public init(amount: UInt) {
         self.amount = amount
+        self.range = nil
     }
 
     /// Initialize the Amount object with a range of learning amount.
@@ -67,6 +68,7 @@ public struct StudyplusRecordAmount {
            return nil
         }
 
+        self.amount = nil
         self.range = range
     }
 

setup.sh

@@ -0,0 +1,10 @@
+#!/bin/sh -x
+
+rm Podfile.lock
+rm Cartfile.resolved
+rm -rf Pods
+rm -rf StudyplusSDK.xcworkspace
+
+pod install
+carthage update --no-use-binaries --platform iOS
+