updates both builds; rolls sdk version (#12)

* updates both builds; rolls sdk version
textileio · Sep 14, 2019 · 98a7f84 · 98a7f84
1 parent 9c4b5c0
commit 98a7f84
Show file tree

Hide file tree

Showing 10 changed files with 390 additions and 210 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -113,7 +113,7 @@ android {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86"
+            include "armeabi-v7a", "arm64-v8a"
         }
     }
     buildTypes {
@@ -135,16 +135,24 @@ android {
             }
         }
     }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
 }
 
 dependencies {
+    implementation project(':@textile_react-native-sdk')
     compile project(':react-native-fs')
     compile project(':react-native-background-timer')
     compile project(':react-native-background-fetch')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation project(':@textile_react-native-sdk')
+    implementation project(':react-native-gesture-handler')
 }
 
 // Run this once to be able to run the application with BUCK

diff --git a/android/app/src/main/java/com/tapp/MainApplication.java b/android/app/src/main/java/com/tapp/MainApplication.java
@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.rnfs.RNFSPackage;
 import com.ocetnik.timer.BackgroundTimerPackage;
 import com.transistorsoft.rnbackgroundfetch.RNBackgroundFetchPackage;
@@ -27,6 +28,7 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new RNGestureHandlerPackage(),
             new RNFSPackage(),
             new BackgroundTimerPackage(),
             new RNBackgroundFetchPackage(),

diff --git a/android/build.gradle b/android/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         buildToolsVersion = "28.0.2"
-        minSdkVersion = 16
+        minSdkVersion = 24
         compileSdkVersion = 28
         targetSdkVersion = 27
         supportLibVersion = "28.0.0"
@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -25,6 +25,9 @@ allprojects {
         mavenLocal()
         google()
         jcenter()
+        maven {
+            url "https://dl.bintray.com/textile/maven"
+        }
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
@@ -33,7 +36,7 @@ allprojects {
             url "$rootDir/../node_modules/react-native-background-fetch/android/libs"
         }
         maven {
-          url "https://dl.bintray.com/textile/maven"
+            url 'https://jitpack.io'
         }
     }
 }

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -5,6 +5,8 @@ include ':react-native-background-timer'
 project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
 include ':react-native-background-fetch'
 project(':react-native-background-fetch').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-fetch/android')
+include ':react-native-gesture-handler'
+project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
 include ':@textile_react-native-sdk'
 project(':@textile_react-native-sdk').projectDir = new File(rootProject.projectDir, '../node_modules/@textile/react-native-sdk/android')
 include ':app'
diff --git a/ios/Podfile b/ios/Podfile
@@ -27,6 +27,8 @@ target 'TApp' do
 
   # your other libraries will follow here!
   pod 'textile-react-native-sdk', :path => '../node_modules/@textile/react-native-sdk'
+  pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
+
 end
 
 # The following is needed to ensure the "archive" step works in XCode.