Skip to content

Commit 4ec9ab7

Browse files
authored
Merge pull request #18 from nonth/master
Fix getUserProfile is not a function on iOS
2 parents ba16b98 + cb20e2c commit 4ec9ab7

File tree

14 files changed

+48
-662
lines changed

14 files changed

+48
-662
lines changed

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55
buildToolsVersion "26.0.1"
66

77
defaultConfig {
8-
minSdkVersion 16
8+
minSdkVersion 17
99
targetSdkVersion 26
1010
versionCode 1
1111
versionName "1.0"
@@ -27,7 +27,7 @@ repositories {
2727

2828
dependencies {
2929
compile fileTree(dir: "libs", include: ["*.jar"])
30-
compile(name:'line-sdk-4.0.8', ext:'aar') { transitive = true }
30+
compile(name:'line-sdk-5.0.0', 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.8.aar

-82 KB
Binary file not shown.

android/libs/line-sdk-5.0.0.aar

245 KB
Binary file not shown.

example/ios/Podfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ platform :ios, '9.0'
22

33
target 'example' do
44
# Pods for example
5-
pod 'LineSDK', '~> 4.1.0'
6-
7-
target 'exampleTests' do
8-
inherit! :search_paths
9-
# Pods for testing
10-
end
11-
5+
pod 'LineSDK', '~> 5.0.0'
6+
127
end

example/ios/Podfile.lock

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

44
DEPENDENCIES:
5-
- LineSDK (~> 4.1.0)
5+
- LineSDK (~> 5.0.0)
6+
7+
SPEC REPOS:
8+
https://github.com/cocoapods/specs.git:
9+
- LineSDK
610

711
SPEC CHECKSUMS:
8-
LineSDK: 5927ecf3cb4ea4767e72377f2ac527f0460e8853
12+
LineSDK: b086f6943d5bb2c05f9bc829323ad574dbedf284
913

10-
PODFILE CHECKSUM: 3c8f185f8cf29805e8c44dbda2639762d2086212
14+
PODFILE CHECKSUM: f3577c0e81566a8d1775ef06f8acc562ea6807f4
1115

12-
COCOAPODS: 1.4.0
16+
COCOAPODS: 1.5.3

example/ios/example-tvOS/Info.plist

Lines changed: 0 additions & 53 deletions
This file was deleted.

example/ios/example-tvOSTests/Info.plist

Lines changed: 0 additions & 24 deletions
This file was deleted.

example/ios/example.xcodeproj/project.pbxproj

Lines changed: 6 additions & 470 deletions
Large diffs are not rendered by default.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

example/ios/example/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",
@@ -29,6 +39,11 @@
2939
"idiom" : "iphone",
3040
"size" : "60x60",
3141
"scale" : "3x"
42+
},
43+
{
44+
"idiom" : "ios-marketing",
45+
"size" : "1024x1024",
46+
"scale" : "1x"
3247
}
3348
],
3449
"info" : {

0 commit comments

Comments
 (0)