Skip to content

Commit 76e977b

Browse files
santiagofmsantiagofm
authored
Merge pull request #12 from xmartlabs/feature/update-line-client
- Updated to use the latest versions of the LineSDK
2 parents c9a854d + 1bd6b66 commit 76e977b

File tree

12 files changed

+48
-51
lines changed

12 files changed

+48
-51
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ iOS and Android Native wrapper for Line's MobileSDK.
33

44
## Requirements
55
- React native `0.48.+`.
6-
- LineSDK iOS `4.0.3` and Android `4.0.6`.
6+
- LineSDK iOS `4.1.0` and Android `4.0.8`.
77

88
## Installation
99
First, install the npm package and link it to your Android and iOS projects with react-native link.

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repositories {
2727

2828
dependencies {
2929
compile fileTree(dir: "libs", include: ["*.jar"])
30-
compile(name:'line-sdk-4.0.6', ext:'aar') { transitive = true }
30+
compile(name:'line-sdk-4.0.8', ext:'aar') { transitive = true }
3131
compile "com.android.support:appcompat-v7:26.0.1"
3232
compile "com.android.support:customtabs:26.0.1"
3333
compile "com.facebook.react:react-native:+" // From node_modules

‎android/libs/line-sdk-4.0.6.aar renamed to ‎android/libs/line-sdk-4.0.8.aar

82 KB
Binary file not shown.

‎example/android/app/libs/line-sdk-4.0.6.aar renamed to ‎example/android/app/libs/line-sdk-4.0.8.aar

82 KB
Binary file not shown.

‎example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
rootProject.name = 'example'
22

33
include ':react-native-line'
4-
project(':react-native-line').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-line/android')
4+
project(':react-native-line').projectDir = new File(rootProject.projectDir, '../../android')
55

66
include ':app'

‎example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ platform :ios, '9.0'
22

33
target 'example' do
44
# Pods for example
5-
pod 'LineSDK', '~> 4.0.3'
5+
pod 'LineSDK', '~> 4.1.0'
66

77
target 'exampleTests' do
88
inherit! :search_paths

‎example/ios/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
PODS:
2-
- LineSDK (4.0.3)
2+
- LineSDK (4.1.0)
33

44
DEPENDENCIES:
5-
- LineSDK (~> 4.0.3)
5+
- LineSDK (~> 4.1.0)
66

77
SPEC CHECKSUMS:
8-
LineSDK: 01a0e7206b2c459f20a2bee888553ae5dc74a709
8+
LineSDK: 5927ecf3cb4ea4767e72377f2ac527f0460e8853
99

10-
PODFILE CHECKSUM: 81705acf7e0b6c5a2f215d09ba091a164c44769d
10+
PODFILE CHECKSUM: 3c8f185f8cf29805e8c44dbda2639762d2086212
1111

12-
COCOAPODS: 1.3.1
12+
COCOAPODS: 1.4.0

‎example/ios/example.xcodeproj/project.pbxproj

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
CBB2F4D41F672B3E00BDA0ED /* libPods-example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 448D058F968600E0147CFEDE /* libPods-example.a */; };
4141
CBB2F4D61F672B4A00BDA0ED /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB2F4D51F672B4A00BDA0ED /* Security.framework */; };
4242
CBB2F4D81F672B4F00BDA0ED /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB2F4D71F672B4F00BDA0ED /* CoreTelephony.framework */; };
43-
CBB2F5671F686B7400BDA0ED /* libLineLoginManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB2F5421F685D4C00BDA0ED /* libLineLoginManager.a */; };
4443
D00AD036A447885A51552843 /* libPods-exampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F43D475A5CC5B33E0B73741A /* libPods-exampleTests.a */; };
4544
/* End PBXBuildFile section */
4645

@@ -276,9 +275,9 @@
276275
remoteGlobalIDString = 3D383D621EBD27B9005632C8;
277276
remoteInfo = "double-conversion-tvOS";
278277
};
279-
CBB2F5411F685D4C00BDA0ED /* PBXContainerItemProxy */ = {
278+
CBBE0F9A206C1BC2005D0E9E /* PBXContainerItemProxy */ = {
280279
isa = PBXContainerItemProxy;
281-
containerPortal = CBB2F53D1F685D4C00BDA0ED /* LineLoginManager.xcodeproj */;
280+
containerPortal = CBBE0F96206C1BC2005D0E9E /* LineLoginManager.xcodeproj */;
282281
proxyType = 2;
283282
remoteGlobalIDString = 134814201AA4EA6300B7C361;
284283
remoteInfo = LineLoginManager;
@@ -318,7 +317,7 @@
318317
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
319318
CBB2F4D51F672B4A00BDA0ED /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
320319
CBB2F4D71F672B4F00BDA0ED /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
321-
CBB2F53D1F685D4C00BDA0ED /* LineLoginManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = LineLoginManager.xcodeproj; path = "../node_modules/react-native-line/ios/LineLoginManager.xcodeproj"; sourceTree = "<group>"; };
320+
CBBE0F96206C1BC2005D0E9E /* LineLoginManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = LineLoginManager.xcodeproj; path = ../../ios/LineLoginManager.xcodeproj; sourceTree = "<group>"; };
322321
F43D475A5CC5B33E0B73741A /* libPods-exampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-exampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
323322
/* End PBXFileReference section */
324323

@@ -336,7 +335,6 @@
336335
isa = PBXFrameworksBuildPhase;
337336
buildActionMask = 2147483647;
338337
files = (
339-
CBB2F5671F686B7400BDA0ED /* libLineLoginManager.a in Frameworks */,
340338
CBB2F4D81F672B4F00BDA0ED /* CoreTelephony.framework in Frameworks */,
341339
CBB2F4D61F672B4A00BDA0ED /* Security.framework in Frameworks */,
342340
CBB2F4D41F672B3E00BDA0ED /* libPods-example.a in Frameworks */,
@@ -534,7 +532,7 @@
534532
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
535533
isa = PBXGroup;
536534
children = (
537-
CBB2F53D1F685D4C00BDA0ED /* LineLoginManager.xcodeproj */,
535+
CBBE0F96206C1BC2005D0E9E /* LineLoginManager.xcodeproj */,
538536
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
539537
146833FF1AC3E56700842450 /* React.xcodeproj */,
540538
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
@@ -595,10 +593,10 @@
595593
name = Products;
596594
sourceTree = "<group>";
597595
};
598-
CBB2F53E1F685D4C00BDA0ED /* Products */ = {
596+
CBBE0F97206C1BC2005D0E9E /* Products */ = {
599597
isa = PBXGroup;
600598
children = (
601-
CBB2F5421F685D4C00BDA0ED /* libLineLoginManager.a */,
599+
CBBE0F9B206C1BC2005D0E9E /* libLineLoginManager.a */,
602600
);
603601
name = Products;
604602
sourceTree = "<group>";
@@ -726,8 +724,8 @@
726724
projectDirPath = "";
727725
projectReferences = (
728726
{
729-
ProductGroup = CBB2F53E1F685D4C00BDA0ED /* Products */;
730-
ProjectRef = CBB2F53D1F685D4C00BDA0ED /* LineLoginManager.xcodeproj */;
727+
ProductGroup = CBBE0F97206C1BC2005D0E9E /* Products */;
728+
ProjectRef = CBBE0F96206C1BC2005D0E9E /* LineLoginManager.xcodeproj */;
731729
},
732730
{
733731
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
@@ -1006,11 +1004,11 @@
10061004
remoteRef = CBB2F50B1F672DDF00BDA0ED /* PBXContainerItemProxy */;
10071005
sourceTree = BUILT_PRODUCTS_DIR;
10081006
};
1009-
CBB2F5421F685D4C00BDA0ED /* libLineLoginManager.a */ = {
1007+
CBBE0F9B206C1BC2005D0E9E /* libLineLoginManager.a */ = {
10101008
isa = PBXReferenceProxy;
10111009
fileType = archive.ar;
10121010
path = libLineLoginManager.a;
1013-
remoteRef = CBB2F5411F685D4C00BDA0ED /* PBXContainerItemProxy */;
1011+
remoteRef = CBBE0F9A206C1BC2005D0E9E /* PBXContainerItemProxy */;
10141012
sourceTree = BUILT_PRODUCTS_DIR;
10151013
};
10161014
/* End PBXReferenceProxy section */

‎example/ios/example/Info.plist

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,31 @@
2020
<string>1.0</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
23+
<key>CFBundleURLTypes</key>
24+
<array>
25+
<dict>
26+
<key>CFBundleTypeRole</key>
27+
<string>Editor</string>
28+
<key>CFBundleURLSchemes</key>
29+
<array>
30+
<string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
31+
</array>
32+
</dict>
33+
</array>
2334
<key>CFBundleVersion</key>
2435
<string>1</string>
36+
<key>LSApplicationQueriesSchemes</key>
37+
<array>
38+
<string>lineauth</string>
39+
<string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
40+
</array>
2541
<key>LSRequiresIPhoneOS</key>
2642
<true/>
27-
<key>LineSDKConfig</key>
28-
<dict>
29-
<key>ChannelID</key>
30-
<string>1534875089</string>
31-
</dict>
32-
<key>CFBundleURLTypes</key>
33-
<array>
34-
<dict>
35-
<key>CFBundleTypeRole</key>
36-
<string>Editor</string>
37-
<key>CFBundleURLSchemes</key>
38-
<array>
39-
<string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
40-
</array>
41-
</dict>
42-
</array>
43-
<key>LSApplicationQueriesSchemes</key>
44-
<array>
45-
<string>lineauth</string>
46-
<string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
47-
</array>
43+
<key>LineSDKConfig</key>
44+
<dict>
45+
<key>ChannelID</key>
46+
<string>1546289569</string>
47+
</dict>
4848
<key>NSAppTransportSecurity</key>
4949
<dict>
5050
<key>NSExceptionDomains</key>

‎example/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "example",
3-
"version": "0.0.1",
3+
"version": "0.0.2",
44
"private": true,
55
"scripts": {
66
"start": "node node_modules/react-native/local-cli/cli.js start",
77
"test": "jest"
88
},
99
"dependencies": {
1010
"react": "16.0.0-alpha.12",
11-
"react-native": "0.48.2",
12-
"react-native-line": "git+https://github.com/xmartlabs/react-native-line.git#feature/androidSupport"
11+
"react-native": "0.48.2",
12+
"react-native-line": "../"
1313
},
1414
"devDependencies": {
1515
"babel-jest": "21.0.2",

‎example/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3443,9 +3443,9 @@ react-devtools-core@^2.5.0:
34433443
shell-quote "^1.6.1"
34443444
ws "^2.0.3"
34453445

3446-
"react-native-line@git+https://github.com/xmartlabs/react-native-line.git#feature/androidSupport":
3447-
version "0.0.1"
3448-
resolved "git+https://github.com/xmartlabs/react-native-line.git#559ddd0e2dacadf4c0a32809942782eca50de37b"
3446+
"react-native-line@git+https://github.com/xmartlabs/react-native-line.git":
3447+
version "1.0.4"
3448+
resolved "git+https://github.com/xmartlabs/react-native-line.git#c9a854d719256572e1072878ebb89d9de3c87c46"
34493449

34503450
react-native@0.48.2:
34513451
version "0.48.2"

‎ios/LineLoginManager.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,10 @@ - (void)loginWithPermissions:(NSArray *)permissions
112112
} else
113113
{
114114
if (permissions && [permissions count] > 0) {
115-
[shared startWebLoginWithSafariViewController:YES];
115+
[shared startWebLoginWithPermissions:permissions];
116116
} else
117117
{
118-
[shared startWebLoginWithSafariViewController:YES
119-
permissions:permissions];
118+
[shared startWebLogin];
120119
}
121120
}
122121
}

0 commit comments

Comments
 (0)