Merge pull request #12 from xmartlabs/feature/update-line-client

- Updated to use the latest versions of the LineSDK
xmartlabs · Mar 28, 2018 · 76e977b · 76e977b
2 parents c9a854d + 1bd6b66
commit 76e977b
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ iOS and Android Native wrapper for Line's MobileSDK.
 
 ## Requirements
 - React native `0.48.+`.
-- LineSDK iOS `4.0.3` and Android `4.0.6`.
+- LineSDK iOS `4.1.0` and Android `4.0.8`.
 
 ## Installation
 First, install the npm package and link it to your Android and iOS projects with react-native link.

diff --git a/android/build.gradle b/android/build.gradle
@@ -27,7 +27,7 @@ repositories {
 
 dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
-    compile(name:'line-sdk-4.0.6', ext:'aar') { transitive = true }
+    compile(name:'line-sdk-4.0.8', ext:'aar') { transitive = true }
     compile "com.android.support:appcompat-v7:26.0.1"
     compile "com.android.support:customtabs:26.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules

diff --git a/android/libs/line-sdk-4.0.6.aar → android/libs/line-sdk-4.0.8.aar b/android/libs/line-sdk-4.0.6.aar → android/libs/line-sdk-4.0.8.aar
diff --git a/example/android/app/libs/line-sdk-4.0.6.aar → example/android/app/libs/line-sdk-4.0.8.aar b/example/android/app/libs/line-sdk-4.0.6.aar → example/android/app/libs/line-sdk-4.0.8.aar
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -1,6 +1,6 @@
 rootProject.name = 'example'
 
 include ':react-native-line'
-project(':react-native-line').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-line/android')
+project(':react-native-line').projectDir = new File(rootProject.projectDir, '../../android')
 
 include ':app'
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -2,7 +2,7 @@ platform :ios, '9.0'
 
 target 'example' do
   # Pods for example
-  pod 'LineSDK', '~> 4.0.3'
+  pod 'LineSDK', '~> 4.1.0'
 
   target 'exampleTests' do
     inherit! :search_paths

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,12 +1,12 @@
 PODS:
-  - LineSDK (4.0.3)
+  - LineSDK (4.1.0)
 
 DEPENDENCIES:
-  - LineSDK (~> 4.0.3)
+  - LineSDK (~> 4.1.0)
 
 SPEC CHECKSUMS:
-  LineSDK: 01a0e7206b2c459f20a2bee888553ae5dc74a709
+  LineSDK: 5927ecf3cb4ea4767e72377f2ac527f0460e8853
 
-PODFILE CHECKSUM: 81705acf7e0b6c5a2f215d09ba091a164c44769d
+PODFILE CHECKSUM: 3c8f185f8cf29805e8c44dbda2639762d2086212
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.4.0
diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj
@@ -40,7 +40,6 @@
 		CBB2F4D41F672B3E00BDA0ED /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 448D058F968600E0147CFEDE /* libPods-example.a */; };
 		CBB2F4D61F672B4A00BDA0ED /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB2F4D51F672B4A00BDA0ED /* Security.framework */; };
 		CBB2F4D81F672B4F00BDA0ED /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB2F4D71F672B4F00BDA0ED /* CoreTelephony.framework */; };
-		CBB2F5671F686B7400BDA0ED /* libLineLoginManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB2F5421F685D4C00BDA0ED /* libLineLoginManager.a */; };
 		D00AD036A447885A51552843 /* libPods-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F43D475A5CC5B33E0B73741A /* libPods-exampleTests.a */; };
 /* End PBXBuildFile section */
 
@@ -276,9 +275,9 @@
 			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
 			remoteInfo = "double-conversion-tvOS";
 		};
-		CBB2F5411F685D4C00BDA0ED /* PBXContainerItemProxy */ = {
+		CBBE0F9A206C1BC2005D0E9E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = CBB2F53D1F685D4C00BDA0ED /* LineLoginManager.xcodeproj */;
+			containerPortal = CBBE0F96206C1BC2005D0E9E /* LineLoginManager.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
 			remoteInfo = LineLoginManager;
@@ -318,7 +317,7 @@
 		ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
 		CBB2F4D51F672B4A00BDA0ED /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		CBB2F4D71F672B4F00BDA0ED /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
-		CBB2F53D1F685D4C00BDA0ED /* LineLoginManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = LineLoginManager.xcodeproj; path = "../node_modules/react-native-line/ios/LineLoginManager.xcodeproj"; sourceTree = "<group>"; };
+		CBBE0F96206C1BC2005D0E9E /* LineLoginManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = LineLoginManager.xcodeproj; path = ../../ios/LineLoginManager.xcodeproj; sourceTree = "<group>"; };
 		F43D475A5CC5B33E0B73741A /* libPods-exampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-exampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -336,7 +335,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CBB2F5671F686B7400BDA0ED /* libLineLoginManager.a in Frameworks */,
 				CBB2F4D81F672B4F00BDA0ED /* CoreTelephony.framework in Frameworks */,
 				CBB2F4D61F672B4A00BDA0ED /* Security.framework in Frameworks */,
 				CBB2F4D41F672B3E00BDA0ED /* libPods-example.a in Frameworks */,
@@ -534,7 +532,7 @@
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				CBB2F53D1F685D4C00BDA0ED /* LineLoginManager.xcodeproj */,
+				CBBE0F96206C1BC2005D0E9E /* LineLoginManager.xcodeproj */,
 				5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
 				146833FF1AC3E56700842450 /* React.xcodeproj */,
 				00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
@@ -595,10 +593,10 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		CBB2F53E1F685D4C00BDA0ED /* Products */ = {
+		CBBE0F97206C1BC2005D0E9E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				CBB2F5421F685D4C00BDA0ED /* libLineLoginManager.a */,
+				CBBE0F9B206C1BC2005D0E9E /* libLineLoginManager.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -726,8 +724,8 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = CBB2F53E1F685D4C00BDA0ED /* Products */;
-					ProjectRef = CBB2F53D1F685D4C00BDA0ED /* LineLoginManager.xcodeproj */;
+					ProductGroup = CBBE0F97206C1BC2005D0E9E /* Products */;
+					ProjectRef = CBBE0F96206C1BC2005D0E9E /* LineLoginManager.xcodeproj */;
 				},
 				{
 					ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
@@ -1006,11 +1004,11 @@
 			remoteRef = CBB2F50B1F672DDF00BDA0ED /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		CBB2F5421F685D4C00BDA0ED /* libLineLoginManager.a */ = {
+		CBBE0F9B206C1BC2005D0E9E /* libLineLoginManager.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libLineLoginManager.a;
-			remoteRef = CBB2F5411F685D4C00BDA0ED /* PBXContainerItemProxy */;
+			remoteRef = CBBE0F9A206C1BC2005D0E9E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */

diff --git a/example/ios/example/Info.plist b/example/ios/example/Info.plist
@@ -20,31 +20,31 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>lineauth</string>
+		<string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-  <key>LineSDKConfig</key>
-  <dict>
-    <key>ChannelID</key>
-    <string>1534875089</string>
-  </dict>
-  <key>CFBundleURLTypes</key>
-  <array>
-    <dict>
-      <key>CFBundleTypeRole</key>
-      <string>Editor</string>
-      <key>CFBundleURLSchemes</key>
-      <array>
-        <string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-      </array>
-    </dict>
-  </array>
-  <key>LSApplicationQueriesSchemes</key>
-  <array>
-    <string>lineauth</string>
-    <string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-  </array>
+	<key>LineSDKConfig</key>
+	<dict>
+		<key>ChannelID</key>
+		<string>1546289569</string>
+	</dict>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>

diff --git a/example/package.json b/example/package.json
@@ -1,15 +1,15 @@
 {
 	"name": "example",
-	"version": "0.0.1",
+	"version": "0.0.2",
 	"private": true,
 	"scripts": {
 		"start": "node node_modules/react-native/local-cli/cli.js start",
 		"test": "jest"
 	},
 	"dependencies": {
 		"react": "16.0.0-alpha.12",
-    "react-native": "0.48.2",
-    "react-native-line": "git+https://github.com/xmartlabs/react-native-line.git#feature/androidSupport"
+		"react-native": "0.48.2",
+		"react-native-line": "../"
 	},
 	"devDependencies": {
 		"babel-jest": "21.0.2",

diff --git a/example/yarn.lock b/example/yarn.lock
@@ -3443,9 +3443,9 @@ react-devtools-core@^2.5.0:
     shell-quote "^1.6.1"
     ws "^2.0.3"
 
-"react-native-line@git+https://github.com/xmartlabs/react-native-line.git#feature/androidSupport":
-  version "0.0.1"
-  resolved "git+https://github.com/xmartlabs/react-native-line.git#559ddd0e2dacadf4c0a32809942782eca50de37b"
+"react-native-line@git+https://github.com/xmartlabs/react-native-line.git":
+  version "1.0.4"
+  resolved "git+https://github.com/xmartlabs/react-native-line.git#c9a854d719256572e1072878ebb89d9de3c87c46"
 
 [email protected]:
   version "0.48.2"

diff --git a/ios/LineLoginManager.m b/ios/LineLoginManager.m
@@ -112,11 +112,10 @@ - (void)loginWithPermissions:(NSArray *)permissions
     } else
     {
         if (permissions && [permissions count] > 0) {
-            [shared startWebLoginWithSafariViewController:YES];
+            [shared startWebLoginWithPermissions:permissions];
         } else
         {
-            [shared startWebLoginWithSafariViewController:YES
-                                              permissions:permissions];
+            [shared startWebLogin];
         }
     }
 }