Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build ReactNative from fork #4981

Merged
merged 1 commit into from
Jun 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)') {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -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)') {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.nightly_fastlane
Original file line number Diff line number Diff line change
Expand Up @@ -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)') {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.parameters
Original file line number Diff line number Diff line change
Expand Up @@ -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')]) {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -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)') {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.upload_release_android
Original file line number Diff line number Diff line change
Expand Up @@ -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)') {
Expand Down
7 changes: 6 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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')
Expand Down
3 changes: 2 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,4 +27,4 @@ allprojects {
maven { url "http://139.162.11.12:8081/artifactory/libs-release-local" }
maven { url "https://jitpack.io" }
}
}
}
5 changes: 4 additions & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Loading