Skip to content
This repository was archived by the owner on Jan 3, 2024. It is now read-only.

Commit 03806e5

Browse files
sergeyzhukovcybergrind
authored andcommitted
Updated TwitterKit to ~3.1 (#11)
* Update twitter kit * Updated example to latest react-native 0.48
1 parent 6644b24 commit 03806e5

File tree

22 files changed

+3269
-1633
lines changed

22 files changed

+3269
-1633
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ DerivedData
2121
*.ipa
2222
*.xcuserstate
2323
project.xcworkspace
24-
Podfile.lock
2524
Pods/
2625

2726
# Built application files

example/.flowconfig

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ node_modules/react-native/flow
2222
flow/
2323

2424
[options]
25-
module.system=haste
25+
emoji=true
2626

27-
experimental.strict_type_args=true
27+
module.system=haste
2828

2929
munge_underscores=true
3030

@@ -34,11 +34,12 @@ suppress_type=$FlowIssue
3434
suppress_type=$FlowFixMe
3535
suppress_type=$FixMe
3636

37-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-6]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
38-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-6]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
37+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
38+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-9]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
3939
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
40+
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
4041

4142
unsafe.enable_getters_and_setters=true
4243

4344
[version]
44-
^0.36.0
45+
^0.49.1

example/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ local.properties
3434
#
3535
node_modules/
3636
npm-debug.log
37+
yarn-error.log
3738

3839
# BUCK
3940
buck-out/
4041
\.buckd/
41-
android/app/libs
4242
*.keystore
4343

4444
# fastlane

example/__tests__/02_test_twitter_native_login.ios.js

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

example/android/app/proguard-rules.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050

5151
-dontwarn com.facebook.react.**
5252

53+
# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
54+
# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
55+
-dontwarn android.text.StaticLayout
56+
5357
# okhttp
5458

5559
-keepattributes Signature

example/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,14 @@
1919
<activity
2020
android:name=".MainActivity"
2121
android:label="@string/app_name"
22-
android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
22+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
23+
android:windowSoftInputMode="adjustResize">
2324
<intent-filter>
2425
<action android:name="android.intent.action.MAIN" />
2526
<category android:name="android.intent.category.LAUNCHER" />
2627
</intent-filter>
2728
</activity>
2829
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
29-
<meta-data
30-
android:name="io.fabric.ApiKey"
31-
android:value="<FABRIC_APIKEY>" />
3230
</application>
3331

3432
</manifest>

example/android/app/src/main/java/com/example/MainApplication.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package com.example;
22

33
import android.app.Application;
4-
import android.util.Log;
54

65
import com.facebook.react.ReactApplication;
7-
import com.facebook.react.ReactInstanceManager;
6+
import com.gettipsi.reactnativetwittersdk.TwitterReactPackage;
87
import com.facebook.react.ReactNativeHost;
98
import com.facebook.react.ReactPackage;
109
import com.facebook.react.shell.MainReactPackage;
1110
import com.facebook.soloader.SoLoader;
12-
import com.gettipsi.reactnativetwittersdk.TwitterReactPackage;
1311

1412
import java.util.Arrays;
1513
import java.util.List;
@@ -18,7 +16,7 @@ public class MainApplication extends Application implements ReactApplication {
1816

1917
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
2018
@Override
21-
protected boolean getUseDeveloperSupport() {
19+
public boolean getUseDeveloperSupport() {
2220
return BuildConfig.DEBUG;
2321
}
2422

example/app.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "example",
3+
"displayName": "example"
4+
}

example/ios/Podfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Uncomment the next line to define a global platform for your project
2-
# platform :ios, '8.0'
2+
platform :ios, '9.0'
33

44
target 'example' do
5-
# use_frameworks!
6-
pod 'TwitterKit', '2.7.0'
5+
pod 'TwitterKit', '~> 3.1'
76
end

example/ios/Podfile.lock

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
PODS:
2+
- TwitterCore (3.0.1)
3+
- TwitterKit (3.1.1):
4+
- TwitterCore (>= 3.0.1)
5+
6+
DEPENDENCIES:
7+
- TwitterKit (~> 3.1)
8+
9+
SPEC CHECKSUMS:
10+
TwitterCore: 6856288a1c25e5281363250681f33b42fce1da42
11+
TwitterKit: 313bf02baee8427f7649b3640169178e5a8b5a99
12+
13+
PODFILE CHECKSUM: 43fca32736f8ba208dd6e42905020987b09df7c0
14+
15+
COCOAPODS: 1.3.1

0 commit comments

Comments
 (0)