From 26ea1ca9fba5268a20432771187a8b609ed1bf2f Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 16:06:26 +0300 Subject: [PATCH 01/15] twitter-kit for android updated to 3.2 --- android/build.gradle | 8 +++++--- .../reactnativetwittersdk/TPSTwitterModule.java | 13 +++++++++---- example/android/build.gradle | 8 ++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 9588d54..b0d122c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,6 @@ buildscript { repositories { + jcenter() mavenCentral() maven { url 'https://maven.fabric.io/public' } } @@ -9,6 +10,7 @@ buildscript { } repositories { + jcenter() mavenCentral() maven { url 'https://maven.fabric.io/public' } } @@ -43,10 +45,10 @@ dependencies { androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.0.1' + compile 'com.android.support:appcompat-v7:26.1.0' compile 'com.facebook.react:react-native:+' - compile('com.twitter.sdk.android:twitter:2.3.0@aar') { - transitive = true; + compile('com.twitter.sdk.android:twitter:3.2.0@aar') { + transitive = true } testCompile 'junit:junit:4.12' } diff --git a/android/src/main/java/com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java b/android/src/main/java/com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java index 4c85ae7..e1462bb 100644 --- a/android/src/main/java/com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java +++ b/android/src/main/java/com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java @@ -15,17 +15,17 @@ import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.WritableMap; -import com.twitter.sdk.android.Twitter; import com.twitter.sdk.android.core.Callback; +import com.twitter.sdk.android.core.DefaultLogger; import com.twitter.sdk.android.core.Result; +import com.twitter.sdk.android.core.Twitter; import com.twitter.sdk.android.core.TwitterAuthConfig; import com.twitter.sdk.android.core.TwitterAuthToken; +import com.twitter.sdk.android.core.TwitterConfig; import com.twitter.sdk.android.core.TwitterException; import com.twitter.sdk.android.core.TwitterSession; import com.twitter.sdk.android.core.identity.TwitterAuthClient; -import io.fabric.sdk.android.Fabric; - /** * This is a {@link NativeModule} that allows JS to use LoginManager of Facebook Android SDK. */ @@ -110,7 +110,12 @@ public void onHostDestroy() { private void initTwitter(final ReadableMap map) { TwitterAuthConfig authConfig = new TwitterAuthConfig(map.getString("twitter_key"), map.getString("twitter_secret")); - Fabric.with(getCurrentActivity(), new Twitter(authConfig)); + TwitterConfig config = new TwitterConfig.Builder(getReactApplicationContext()) + .logger(new DefaultLogger(Log.DEBUG)) + .twitterAuthConfig(authConfig) + .debug(true) + .build(); + Twitter.initialize(config); } private TwitterAuthClient getTwitterAuthClient() { diff --git a/example/android/build.gradle b/example/android/build.gradle index d025adb..eab9958 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -3,6 +3,10 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { classpath 'com.android.tools.build:gradle:2.2.3' @@ -22,5 +26,9 @@ allprojects { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" } + maven { + url 'https://maven.google.com/' + name 'Google' + } } } From 3e7455b842873277783f9c9880c6a1f6b0f95172 Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 16:35:52 +0300 Subject: [PATCH 02/15] updated versions --- android/build.gradle | 8 ++++---- example/android/app/build.gradle | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b0d122c..f83fc2d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,12 +20,12 @@ apply plugin: 'com.android.library' apply plugin: 'io.fabric' android { - compileSdkVersion 25 - buildToolsVersion "25.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" @@ -47,7 +47,7 @@ dependencies { }) compile 'com.android.support:appcompat-v7:26.1.0' compile 'com.facebook.react:react-native:+' - compile('com.twitter.sdk.android:twitter:3.2.0@aar') { + compile('com.twitter.sdk.android:twitter-core:3.2.0@aar') { transitive = true } testCompile 'junit:junit:4.12' diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index cb1d69d..db61a97 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -84,13 +84,13 @@ def enableSeparateBuildPerCPUArchitecture = false def enableProguardInReleaseBuilds = false android { - compileSdkVersion 25 - buildToolsVersion "25.0.1" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { applicationId "com.example" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" ndk { @@ -138,7 +138,7 @@ android { dependencies { compile fileTree(dir: "libs", include: ["*.jar"]) compile project(':tipsi-twitter') - compile "com.android.support:appcompat-v7:23.0.1" + compile 'com.android.support:appcompat-v7:26.1.0' compile "com.facebook.react:react-native:+" // From node_modules } From e6ed766ac80867cdca0f678903d0c957e0f4fc4d Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 17:42:47 +0300 Subject: [PATCH 03/15] version of twitter-kit changed to 3.1.0 --- android/build.gradle | 4 +--- example/android/app/build.gradle | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f83fc2d..7f74996 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -28,9 +28,7 @@ android { targetSdkVersion 26 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } buildTypes { release { @@ -47,7 +45,7 @@ dependencies { }) compile 'com.android.support:appcompat-v7:26.1.0' compile 'com.facebook.react:react-native:+' - compile('com.twitter.sdk.android:twitter-core:3.2.0@aar') { + compile('com.twitter.sdk.android:twitter-core:3.1.0@aar') { transitive = true } testCompile 'junit:junit:4.12' diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index db61a97..2c95125 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -96,7 +96,16 @@ android { ndk { abiFilters "armeabi-v7a", "x86" } + jackOptions { + enabled true + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 } + splits { abi { reset() From c50168659656267d7b31717f6f6f59303ac4d741 Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 18:04:48 +0300 Subject: [PATCH 04/15] Updated licenses for android build tools 26.0.2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b58ff29..0f50e15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ matrix: - platform-tools - tools - build-tools-25.0.1 + - build-tools-26.0.2 - android-21 - sys-img-armeabi-v7a-android-21 - extra-android-m2repository From d4cd7271462822cc58949866f52f81559f98f643 Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 18:12:54 +0300 Subject: [PATCH 05/15] version of twitter-kit changed to 3.1.1 + replaced any fabric --- android/build.gradle | 9 +-------- example/android/build.gradle | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 7f74996..f5e4117 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,22 +2,15 @@ buildscript { repositories { jcenter() mavenCentral() - maven { url 'https://maven.fabric.io/public' } - } - dependencies { - classpath 'io.fabric.tools:gradle:1.+' } } repositories { jcenter() mavenCentral() - maven { url 'https://maven.fabric.io/public' } } - apply plugin: 'com.android.library' -apply plugin: 'io.fabric' android { compileSdkVersion 26 @@ -45,7 +38,7 @@ dependencies { }) compile 'com.android.support:appcompat-v7:26.1.0' compile 'com.facebook.react:react-native:+' - compile('com.twitter.sdk.android:twitter-core:3.1.0@aar') { + compile('com.twitter.sdk.android:twitter-core:3.1.1@aar') { transitive = true } testCompile 'junit:junit:4.12' diff --git a/example/android/build.gradle b/example/android/build.gradle index eab9958..d9ab00a 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -18,8 +18,6 @@ buildscript { allprojects { repositories { - // Add fabric repository (added by tipsi-twitter) - maven { url "https://maven.fabric.io/public" } mavenLocal() jcenter() maven { From eaadb81ac2389e4eec2d2d5019c3865d1662bf67 Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 18:15:09 +0300 Subject: [PATCH 06/15] debug flag disabled --- .../com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/src/main/java/com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java b/android/src/main/java/com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java index e1462bb..0978a67 100644 --- a/android/src/main/java/com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java +++ b/android/src/main/java/com/gettipsi/reactnativetwittersdk/TPSTwitterModule.java @@ -27,7 +27,7 @@ import com.twitter.sdk.android.core.identity.TwitterAuthClient; /** - * This is a {@link NativeModule} that allows JS to use LoginManager of Facebook Android SDK. + * This is a {@link NativeModule} that allows JS to use login feature of twitter-kit sdk. */ public class TPSTwitterModule extends ReactContextBaseJavaModule implements LifecycleEventListener { @@ -113,7 +113,6 @@ private void initTwitter(final ReadableMap map) { TwitterConfig config = new TwitterConfig.Builder(getReactApplicationContext()) .logger(new DefaultLogger(Log.DEBUG)) .twitterAuthConfig(authConfig) - .debug(true) .build(); Twitter.initialize(config); } From db62233708b2d27154760fc5ce6bf951bcbe1103 Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 18:18:27 +0300 Subject: [PATCH 07/15] updated travis config --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f50e15..b2dd779 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ matrix: components: - platform-tools - tools - - build-tools-25.0.1 - build-tools-26.0.2 - android-21 - sys-img-armeabi-v7a-android-21 From a28016dbb0fec9ae02aff9b3014e91f294e3a1c2 Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 18:25:21 +0300 Subject: [PATCH 08/15] replaced unnessecary flags --- example/android/app/build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 2c95125..8e6e34b 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -96,14 +96,6 @@ android { ndk { abiFilters "armeabi-v7a", "x86" } - jackOptions { - enabled true - } - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_7 - targetCompatibility = JavaVersion.VERSION_1_7 } splits { From 86f2974b0c444cf4df9a07477dd2d485eaf59a9f Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 18:42:04 +0300 Subject: [PATCH 09/15] attempt to fix travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b2dd779..4735eb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,12 @@ matrix: sudo: required android: components: + - tools - platform-tools - tools - build-tools-26.0.2 - android-21 + - android-26 - sys-img-armeabi-v7a-android-21 - extra-android-m2repository - extra-google-m2repository From b3fea68ed4091c56dda5ed2a42fac9b378b5c079 Mon Sep 17 00:00:00 2001 From: Anton Kuznetsov Date: Fri, 6 Apr 2018 18:09:07 +0200 Subject: [PATCH 10/15] Sync travis comfig with tipsi-stripe --- .travis.yml | 2 +- .travis/before-install.sh | 2 +- android/build.gradle | 31 ++++++++++++++++--------------- example/android/app/build.gradle | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4735eb5..12f052a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ matrix: sudo: required android: components: - - tools - platform-tools - tools + - build-tools-25.0.0 - build-tools-26.0.2 - android-21 - android-26 diff --git a/.travis/before-install.sh b/.travis/before-install.sh index b677788..68e9d76 100755 --- a/.travis/before-install.sh +++ b/.travis/before-install.sh @@ -34,7 +34,7 @@ init_new_example_project() { } $HOME/.nvm/nvm.sh -nvm install 8.4.0 +nvm install 8.9.0 npm i npm@5 -g case "${TRAVIS_OS_NAME}" in diff --git a/android/build.gradle b/android/build.gradle index f5e4117..b6a4fef 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,28 +1,17 @@ -buildscript { - repositories { - jcenter() - mavenCentral() - } -} - -repositories { - jcenter() - mavenCentral() -} - apply plugin: 'com.android.library' android { compileSdkVersion 26 - buildToolsVersion "26.0.2" + buildToolsVersion '26.0.2' defaultConfig { minSdkVersion 16 targetSdkVersion 26 versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + versionName '1.0' + testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' } + buildTypes { release { minifyEnabled false @@ -43,3 +32,15 @@ dependencies { } testCompile 'junit:junit:4.12' } + +buildscript { + repositories { + jcenter() + mavenCentral() + } +} + +repositories { + jcenter() + mavenCentral() +} diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 8e6e34b..b47d64e 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -137,8 +137,8 @@ android { } dependencies { - compile fileTree(dir: "libs", include: ["*.jar"]) compile project(':tipsi-twitter') + compile fileTree(dir: "libs", include: ["*.jar"]) compile 'com.android.support:appcompat-v7:26.1.0' compile "com.facebook.react:react-native:+" // From node_modules } From fbb70e4186f6209585e48dbf1867575844c921cb Mon Sep 17 00:00:00 2001 From: Anton Kuznetsov Date: Fri, 6 Apr 2018 18:19:57 +0200 Subject: [PATCH 11/15] Add compile 'com.android.support:support-v4:26.1.0' --- android/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/android/build.gradle b/android/build.gradle index b6a4fef..eb5a8d8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,6 +26,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:support-v4:26.1.0' compile 'com.facebook.react:react-native:+' compile('com.twitter.sdk.android:twitter-core:3.1.1@aar') { transitive = true From 1ab606ad1ceb88f302b30cb27f66c6e33019c426 Mon Sep 17 00:00:00 2001 From: Anton Kuznetsov Date: Fri, 6 Apr 2018 18:21:15 +0200 Subject: [PATCH 12/15] Add maven google repo --- android/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index eb5a8d8..bfe20ff 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -44,4 +44,8 @@ buildscript { repositories { jcenter() mavenCentral() + maven { + url 'https://maven.google.com/' + name 'Google' + } } From 68aaccc31474ada14f81b57aecb841fb2f5bfc18 Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 19:28:15 +0300 Subject: [PATCH 13/15] Added - extra-android-support --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 12f052a..0e1e6a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ matrix: - extra-android-m2repository - extra-google-m2repository - extra-google-google_play_services + - extra-android-support cache: directories: From 5586f18b1a3e7c661d4dff8228862053355d52e8 Mon Sep 17 00:00:00 2001 From: Anton Kuznetsov Date: Fri, 6 Apr 2018 18:38:02 +0200 Subject: [PATCH 14/15] Update build-gradle --- android/build.gradle | 10 +++++----- example/android/app/build.gradle | 8 ++++++++ example/android/build.gradle | 8 ++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index bfe20ff..8b58651 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -22,15 +22,15 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile 'com.android.support:appcompat-v7:26.1.0' - compile 'com.android.support:support-v4:26.1.0' compile 'com.facebook.react:react-native:+' + compile 'com.android.support:support-v4:26.1.0' + compile 'com.android.support:appcompat-v7:26.1.0' compile('com.twitter.sdk.android:twitter-core:3.1.1@aar') { transitive = true } + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) testCompile 'junit:junit:4.12' } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index b47d64e..73f4cf3 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -139,6 +139,7 @@ android { dependencies { compile project(':tipsi-twitter') compile fileTree(dir: "libs", include: ["*.jar"]) + compile "com.android.support:support-v4:26.1.0" compile 'com.android.support:appcompat-v7:26.1.0' compile "com.facebook.react:react-native:+" // From node_modules } @@ -149,3 +150,10 @@ task copyDownloadableDepsToLibs(type: Copy) { from configurations.compile into 'libs' } + +repositories { + maven { + url 'https://maven.google.com/' + name 'Google' + } +} diff --git a/example/android/build.gradle b/example/android/build.gradle index d9ab00a..48aca3c 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -18,15 +18,15 @@ buildscript { allprojects { repositories { + maven { + url 'https://maven.google.com/' + name 'Google' + } mavenLocal() jcenter() maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" } - maven { - url 'https://maven.google.com/' - name 'Google' - } } } From cded7c8fc1d638ceeccde3c22cbd25724bf64113 Mon Sep 17 00:00:00 2001 From: paynd Date: Fri, 6 Apr 2018 20:04:24 +0300 Subject: [PATCH 15/15] testing deps --- example/android/app/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 73f4cf3..e862185 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -140,7 +140,6 @@ dependencies { compile project(':tipsi-twitter') compile fileTree(dir: "libs", include: ["*.jar"]) compile "com.android.support:support-v4:26.1.0" - compile 'com.android.support:appcompat-v7:26.1.0' compile "com.facebook.react:react-native:+" // From node_modules }