build React Native from fork

status-im · Jun 29, 2018 · f27e4fe · f27e4fe
1 parent 03472b6
commit f27e4fe
Show file tree

Hide file tree

Showing 12 changed files with 884 additions and 474 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -54,7 +54,7 @@ timeout(90) {
 
         // Android
         stage('Build (Android)') {
-          sh 'cd android && ./gradlew assembleRelease'
+          sh 'cd android && ./gradlew react-native-android:installArchives && ./gradlew assembleRelease'
         }
 
         stage('Deploy (Android)') {

diff --git a/Jenkinsfile.nightly b/Jenkinsfile.nightly
@@ -50,7 +50,7 @@ timeout(90) {
         }
 
         stage('Build (Android)') {
-          sh 'cd android && ./gradlew assembleRelease'
+          sh 'cd android && ./gradlew react-native-android:installArchives && ./gradlew assembleRelease'
         }
 
         stage('Build (iOS)') {

diff --git a/Jenkinsfile.nightly_fastlane b/Jenkinsfile.nightly_fastlane
@@ -70,7 +70,7 @@ timeout(90) {
         }
 
         stage('Build (Android)') {
-          sh 'cd android && ./gradlew assembleRelease'
+          sh 'cd android && ./gradlew react-native-android:installArchives && ./gradlew assembleRelease'
         }
 
         stage('Build (iOS)') {

diff --git a/Jenkinsfile.parameters b/Jenkinsfile.parameters
@@ -71,7 +71,7 @@ timeout(90) {
 
             // Android
             stage('Build (Android)') {
-              sh 'cd android && ./gradlew assembleRelease'
+              sh 'cd android && ./gradlew react-native-android:installArchives && ./gradlew assembleRelease'
             }
             stage('Deploy (Android)') {
                 withCredentials([string(credentialsId: 'diawi-token', variable: 'token')]) {

diff --git a/Jenkinsfile.release b/Jenkinsfile.release
@@ -70,7 +70,7 @@ timeout(90) {
         }
 
         stage('Build (Android)') {
-          sh 'cd android && ./gradlew assembleRelease -PreleaseVersion=' + version
+          sh 'cd android && ./gradlew react-native-android:installArchives && ./gradlew assembleRelease -PreleaseVersion=' + version
         }
 
         stage('Build (iOS)') {

diff --git a/Jenkinsfile.upload_release_android b/Jenkinsfile.upload_release_android
@@ -74,7 +74,7 @@ timeout(90) {
         }
 
         stage('Build (Android)') {
-          sh 'cd android && ./gradlew assembleRelease -PreleaseVersion=' + version
+          sh 'cd android && ./gradlew react-native-android:installArchives && ./gradlew assembleRelease -PreleaseVersion=' + version
         }
 
         stage('Deploy (Android)') {

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -196,6 +196,10 @@ android {
     sourceSets { main { jniLibs.srcDirs 'libs' } }
 }
 
+configurations.all {
+    exclude group: 'com.facebook.react', module: 'react-native'
+}
+
 dependencies {
     implementation project(':react-native-background-timer')
     implementation project(':react-native-svg')
@@ -211,7 +215,8 @@ dependencies {
     implementation "com.android.support:appcompat-v7:26.1.0"
     // Force using exact RN version instead of relying on gradle dependency resolution
     // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
-    compile ("com.facebook.react:react-native:0.55.4") { force = true }  // From node_modules
+    //compile ("com.facebook.react:react-native:0.55.4") { force = true }  // From node_modules
+    implementation project(':react-native-android')
     implementation project(':react-native-i18n')
     implementation project(':react-native-camera')
     implementation project(':react-native-status')

diff --git a/android/build.gradle b/android/build.gradle
@@ -8,6 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'de.undercouch:gradle-download-task:3.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -26,4 +27,4 @@ allprojects {
         maven { url "http://139.162.11.12:8081/artifactory/libs-release-local" }
         maven { url "https://jitpack.io" }
     }
-}
+}
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -41,4 +41,7 @@ project(':react-native-webview-bridge').projectDir = new File(rootProject.projec
 include ':react-native-config'
 project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
 include ':react-native-testfairy'
-project(':react-native-testfairy').projectDir = new File(settingsDir, '../node_modules/react-native-testfairy/android')
+project(':react-native-testfairy').projectDir = new File(settingsDir, '../node_modules/react-native-testfairy/android')
+
+include ':react-native-android'
+project(':react-native-android').projectDir = new File(rootProject.projectDir, '../node_modules/react-native/ReactAndroid')