From dbf28b03a299a59f29b487eae3de0ba673c9ee4e Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 19:24:31 -0200 Subject: [PATCH 01/48] Adds circle-ci script --- circle.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 000000000..7aea721c8 --- /dev/null +++ b/circle.yml @@ -0,0 +1,36 @@ +machine: + xcode: + version: '8.0' + environment: + YARN_VERSION: 0.18.1 + # Needed for Android SDK installation bash script (see below) + ANDROID_HOME: "/usr/local/Cellar/android-sdk" + PATH: "${PATH}:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" + GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' + +dependencies: + pre: + # Install YARN + - | + if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then + curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION + fi + override: + # The Android Gradle build will need the Android signing keystore keys setup + - mkdir -p ~/.gradle + # Install Gems (fastlane, etc) + - bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3 --without development + # Install node modules + - yarn install + cache_directories: + # Let's speed up the next build by cacheing installed dependencies + - ~/.yarn + - ~/.cache/yarn + - vendor/bundle + - node_modules + - ~/Library/Caches/CocoaPods +deployment: + beta: + branch: qa + commands: + - yarn && ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ From 7688f97d07fc003cc314c871588940370b72527a Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 19:28:28 -0200 Subject: [PATCH 02/48] Adds gradlew step, remove gems --- circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 7aea721c8..e9d9c4ad6 100644 --- a/circle.yml +++ b/circle.yml @@ -18,8 +18,6 @@ dependencies: override: # The Android Gradle build will need the Android signing keystore keys setup - mkdir -p ~/.gradle - # Install Gems (fastlane, etc) - - bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3 --without development # Install node modules - yarn install cache_directories: @@ -33,4 +31,6 @@ deployment: beta: branch: qa commands: - - yarn && ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ + - yarn + - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ + - cd android && ./gradlew assembleRelease From bcb218697e413211cf92d94fa5623795779f036b Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 19:33:23 -0200 Subject: [PATCH 03/48] Update package node version --- package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.json b/package.json index 65074e984..de056e960 100644 --- a/package.json +++ b/package.json @@ -69,5 +69,10 @@ "preset": "react-native", "coverageDirectory": "./coverage/", "collectCoverage": true + }, + "devEngines": { + "node": ">=8.x", + "npm": ">=4.x", + "yarn": ">=0.21.3" } } From 70f7cc8733f626c8450acd02b1c31de0af07c8bf Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 19:36:45 -0200 Subject: [PATCH 04/48] Update package node version 2 --- circle.yml | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index e9d9c4ad6..5c61ab79f 100644 --- a/circle.yml +++ b/circle.yml @@ -11,6 +11,7 @@ machine: dependencies: pre: # Install YARN + - node -v - | if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION diff --git a/package.json b/package.json index de056e960..4a1688e05 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "coverageDirectory": "./coverage/", "collectCoverage": true }, - "devEngines": { + "engines": { "node": ">=8.x", "npm": ">=4.x", "yarn": ">=0.21.3" From 1c708ac1cf1ad6fe4236f0a2ec5500ce794e364a Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 19:43:00 -0200 Subject: [PATCH 05/48] updating node version --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 5c61ab79f..04ae794b1 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,6 @@ machine: + node: + version: 8 xcode: version: '8.0' environment: From a4888f84df8aca207fedf92b0c14058add46a0af Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 19:53:21 -0200 Subject: [PATCH 06/48] configure artifacts --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 04ae794b1..30a1e3db6 100644 --- a/circle.yml +++ b/circle.yml @@ -30,6 +30,7 @@ dependencies: - vendor/bundle - node_modules - ~/Library/Caches/CocoaPods + deployment: beta: branch: qa @@ -37,3 +38,4 @@ deployment: - yarn - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ - cd android && ./gradlew assembleRelease + - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS From f61bbd68ebbce38d2941a75ec55541d140c1bea9 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 20:09:40 -0200 Subject: [PATCH 07/48] change structure --- circle.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/circle.yml b/circle.yml index 30a1e3db6..c33f05057 100644 --- a/circle.yml +++ b/circle.yml @@ -22,7 +22,10 @@ dependencies: # The Android Gradle build will need the Android signing keystore keys setup - mkdir -p ~/.gradle # Install node modules - - yarn install + - yarn + - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ + - cd android && ./gradlew assembleRelease + - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS cache_directories: # Let's speed up the next build by cacheing installed dependencies - ~/.yarn @@ -30,12 +33,3 @@ dependencies: - vendor/bundle - node_modules - ~/Library/Caches/CocoaPods - -deployment: - beta: - branch: qa - commands: - - yarn - - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ - - cd android && ./gradlew assembleRelease - - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS From 77b85b58dc29b1be78002afb6f9a83547ed041cd Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 20:16:43 -0200 Subject: [PATCH 08/48] android home --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index c33f05057..369d84b05 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,6 @@ machine: environment: YARN_VERSION: 0.18.1 # Needed for Android SDK installation bash script (see below) - ANDROID_HOME: "/usr/local/Cellar/android-sdk" PATH: "${PATH}:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' @@ -26,6 +25,8 @@ dependencies: - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ - cd android && ./gradlew assembleRelease - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS + - cp -r android/app/build/outputs $CIRCLE_ARTIFACTS + cache_directories: # Let's speed up the next build by cacheing installed dependencies - ~/.yarn From 0dc2e222063be827ee9451cc1e58fb6f7b7bb783 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 20:23:34 -0200 Subject: [PATCH 09/48] android accept --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index 369d84b05..0845a9f9a 100644 --- a/circle.yml +++ b/circle.yml @@ -19,6 +19,7 @@ dependencies: fi override: # The Android Gradle build will need the Android signing keystore keys setup + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository - mkdir -p ~/.gradle # Install node modules - yarn @@ -34,3 +35,6 @@ dependencies: - vendor/bundle - node_modules - ~/Library/Caches/CocoaPods + - /usr/local/android-sdk-linux/platforms/android-25 + - /usr/local/android-sdk-linux/build-tools/25.0.0 + - /usr/local/android-sdk-linux/extras/android/m2repository From 167e88ec2cc79e4e61c521d950292598e95f4dfc Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 31 Oct 2017 20:47:39 -0200 Subject: [PATCH 10/48] update sdk version accept --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 0845a9f9a..7bcf9fa72 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,7 @@ dependencies: fi override: # The Android Gradle build will need the Android signing keystore keys setup - - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository - mkdir -p ~/.gradle # Install node modules - yarn From 3db706fd0cf875344b849e0ae71b4bc3f643a84e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 31 Oct 2017 22:36:00 -0200 Subject: [PATCH 11/48] Update circle.yml --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 7bcf9fa72..ee253c8cb 100644 --- a/circle.yml +++ b/circle.yml @@ -20,6 +20,7 @@ dependencies: override: # The Android Gradle build will need the Android signing keystore keys setup - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository + - yes | sudo sdkmanager --licenses - mkdir -p ~/.gradle # Install node modules - yarn From 377691c9f629db0b75e7ef95450e2712b0b91639 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 31 Oct 2017 22:43:04 -0200 Subject: [PATCH 12/48] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index ee253c8cb..6c9fc9ab8 100644 --- a/circle.yml +++ b/circle.yml @@ -20,7 +20,7 @@ dependencies: override: # The Android Gradle build will need the Android signing keystore keys setup - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository - - yes | sudo sdkmanager --licenses + - yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses - mkdir -p ~/.gradle # Install node modules - yarn From 1d07633d2977078e8fafeaa55013430000d861b2 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 31 Oct 2017 23:05:15 -0200 Subject: [PATCH 13/48] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 6c9fc9ab8..5c496a13c 100644 --- a/circle.yml +++ b/circle.yml @@ -20,7 +20,7 @@ dependencies: override: # The Android Gradle build will need the Android signing keystore keys setup - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository - - yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses + - $ANDROID_HOME/tools/bin/sdkmanager --update && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses - mkdir -p ~/.gradle # Install node modules - yarn From 0004f6ab5a8e62c5e75cebb75b9705caf6abe027 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 31 Oct 2017 23:11:40 -0200 Subject: [PATCH 14/48] Update circle.yml --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 5c496a13c..cad9bc591 100644 --- a/circle.yml +++ b/circle.yml @@ -20,7 +20,8 @@ dependencies: override: # The Android Gradle build will need the Android signing keystore keys setup - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository - - $ANDROID_HOME/tools/bin/sdkmanager --update && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses + - $ANDROID_HOME/tools/bin/sdkmanager --update + - echo y | $ANDROID_HOME/tools/bin/sdkmanager --licenses - mkdir -p ~/.gradle # Install node modules - yarn From 6e479d79e7e4703d8a4841241806b416a6126c7e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 31 Oct 2017 23:16:31 -0200 Subject: [PATCH 15/48] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index cad9bc591..65e9337b7 100644 --- a/circle.yml +++ b/circle.yml @@ -20,7 +20,7 @@ dependencies: override: # The Android Gradle build will need the Android signing keystore keys setup - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository - - $ANDROID_HOME/tools/bin/sdkmanager --update + - echo y | $ANDROID_HOME/tools/bin/sdkmanager --update - echo y | $ANDROID_HOME/tools/bin/sdkmanager --licenses - mkdir -p ~/.gradle # Install node modules From 211bc336069b68f841d2e5c8c6a7fc801d867f07 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 00:17:46 -0200 Subject: [PATCH 16/48] Update build.gradle --- android/build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index eed9972b5..2986d45d7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,6 +12,15 @@ buildscript { } } +signingConfigs { + release { + storeFile file(System.getenv("KEYSTORE")) + storePassword System.getenv("KEYSTORE_PASSWORD") + keyAlias System.getenv("KEY_ALIAS") + keyPassword System.getenv("KEY_PASSWORD") + } +} + allprojects { repositories { mavenLocal() From b898d2524b1a2add996dcfe023d3294d55f9292f Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 00:41:12 -0200 Subject: [PATCH 17/48] Update circle.yml --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 65e9337b7..c862a5bfb 100644 --- a/circle.yml +++ b/circle.yml @@ -17,6 +17,7 @@ dependencies: if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION fi + - echo $KEYSTORE_BASE64 | base64 --decode > $KEYSTORE override: # The Android Gradle build will need the Android signing keystore keys setup - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository From 43ca012ad837e6e631da5dddc91c9f683667ffd6 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 00:43:02 -0200 Subject: [PATCH 18/48] Update circle.yml --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index c862a5bfb..a63371b7b 100644 --- a/circle.yml +++ b/circle.yml @@ -13,11 +13,12 @@ dependencies: pre: # Install YARN - node -v + - echo $KEYSTORE_BASE64 | base64 --decode > $KEYSTORE - | if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION fi - - echo $KEYSTORE_BASE64 | base64 --decode > $KEYSTORE + override: # The Android Gradle build will need the Android signing keystore keys setup - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository From d739dd46a9afb4742680de31fc377adae8e14a5b Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 00:51:37 -0200 Subject: [PATCH 19/48] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index a63371b7b..27f0bc19e 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,7 @@ dependencies: pre: # Install YARN - node -v - - echo $KEYSTORE_BASE64 | base64 --decode > $KEYSTORE + - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "$KEYSTORE" - | if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION From 0f82eaf5b9829565336bc4fa58706e331c15cbaf Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 00:56:39 -0200 Subject: [PATCH 20/48] Update circle.yml --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 27f0bc19e..59bc11c79 100644 --- a/circle.yml +++ b/circle.yml @@ -14,6 +14,8 @@ dependencies: # Install YARN - node -v - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "$KEYSTORE" + - echo $KEYSTORE_BASE64 + - echo $KEYSTORE - | if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION From f2a0f51b45047455ed3f9aebedcb11ac9a1a6cb4 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 01:11:50 -0200 Subject: [PATCH 21/48] Update build.gradle --- android/build.gradle | 9 --------- 1 file changed, 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 2986d45d7..eed9972b5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,15 +12,6 @@ buildscript { } } -signingConfigs { - release { - storeFile file(System.getenv("KEYSTORE")) - storePassword System.getenv("KEYSTORE_PASSWORD") - keyAlias System.getenv("KEY_ALIAS") - keyPassword System.getenv("KEY_PASSWORD") - } -} - allprojects { repositories { mavenLocal() From 064898fbd3e368402b7fbaac4f9b390a179e7675 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 01:12:20 -0200 Subject: [PATCH 22/48] Update build.gradle --- android/app/build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index a679b6179..13bb3a082 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -143,6 +143,15 @@ android { } } +signingConfigs { + release { + storeFile file(System.getenv("KEYSTORE")) + storePassword System.getenv("KEYSTORE_PASSWORD") + keyAlias System.getenv("KEY_ALIAS") + keyPassword System.getenv("KEY_PASSWORD") + } +} + dependencies { compile project(':react-native-svg') compile project(':react-native-image-picker') From d25e65f98e7112368ca379b1e0f9185e24d44b44 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 11:10:46 -0200 Subject: [PATCH 23/48] Update build.gradle --- android/app/build.gradle | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 13bb3a082..7b92d823d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,12 +105,10 @@ android { } signingConfigs { release { - if (project.hasProperty('ROCKETCHAT_RN_RELEASE_STORE_FILE')) { - storeFile file(ROCKETCHAT_RN_RELEASE_STORE_FILE) - storePassword ROCKETCHAT_RN_RELEASE_STORE_PASSWORD - keyAlias ROCKETCHAT_RN_RELEASE_KEY_ALIAS - keyPassword ROCKETCHAT_RN_RELEASE_KEY_PASSWORD - } + storeFile file(System.getenv("KEYSTORE")) + storePassword System.getenv("KEYSTORE_PASSWORD") + keyAlias System.getenv("KEY_ALIAS") + keyPassword System.getenv("KEY_PASSWORD") } } splits { @@ -143,15 +141,6 @@ android { } } -signingConfigs { - release { - storeFile file(System.getenv("KEYSTORE")) - storePassword System.getenv("KEYSTORE_PASSWORD") - keyAlias System.getenv("KEY_ALIAS") - keyPassword System.getenv("KEY_PASSWORD") - } -} - dependencies { compile project(':react-native-svg') compile project(':react-native-image-picker') From 8b66efff57a107fb1725198927ce20e670246c77 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 11:46:39 -0200 Subject: [PATCH 24/48] Update build.gradle --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7b92d823d..0c971c347 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,7 +105,7 @@ android { } signingConfigs { release { - storeFile file(System.getenv("KEYSTORE")) + storeFile project.rootProject.file(System.getenv("KEYSTORE")).getCanonicalFile() storePassword System.getenv("KEYSTORE_PASSWORD") keyAlias System.getenv("KEY_ALIAS") keyPassword System.getenv("KEY_PASSWORD") From 6357d696a8e32826ba891225070302e8e0b711b2 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 1 Nov 2017 11:47:41 -0200 Subject: [PATCH 25/48] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 59bc11c79..cce859678 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,7 @@ dependencies: pre: # Install YARN - node -v - - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "$KEYSTORE" + - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/$KEYSTORE" - echo $KEYSTORE_BASE64 - echo $KEYSTORE - | From 2c3822a065af8d0b95496796bba4ca0adab8a3dd Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 15:46:39 -0200 Subject: [PATCH 26/48] Remove cp since we already moved the folder --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index cce859678..b69aa6dcf 100644 --- a/circle.yml +++ b/circle.yml @@ -32,7 +32,6 @@ dependencies: - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ - cd android && ./gradlew assembleRelease - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS - - cp -r android/app/build/outputs $CIRCLE_ARTIFACTS cache_directories: # Let's speed up the next build by cacheing installed dependencies From 75d17eab08732b1329140ec9945de57d284e2308 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 16:44:04 -0200 Subject: [PATCH 27/48] Adding shared scheme --- circle.yml | 4 +--- ios/RocketChatRN.xcodeproj/project.pbxproj | 7 +++++-- .../xcshareddata/xcschemes/RocketChatRN-tvOS.xcscheme | 4 +++- .../xcshareddata/xcschemes/RocketChatRN.xcscheme | 4 +++- .../Images.xcassets/AppIcon.appiconset/Contents.json | 7 ++++++- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index b69aa6dcf..3d30cd0d6 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,7 @@ machine: node: version: 8 xcode: - version: '8.0' + version: '8.3' environment: YARN_VERSION: 0.18.1 # Needed for Android SDK installation bash script (see below) @@ -14,8 +14,6 @@ dependencies: # Install YARN - node -v - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/$KEYSTORE" - - echo $KEYSTORE_BASE64 - - echo $KEYSTORE - | if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index 1c1729b47..b2b2c3535 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -5,6 +5,7 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; @@ -672,6 +673,7 @@ 6533FB90166345D29F1B91C0 /* libRNFetchBlob.a */, 5A0EEFAF8AB14F5B9E796CDD /* libRNVectorIcons.a */, DA50CE47374C4C35BE6D9D58 /* libRNSVG.a */, + 3B696712EE2345A59F007A88 /* libRNImagePicker.a */, ); name = "Recovered References"; sourceTree = ""; @@ -800,6 +802,7 @@ TestTargetID = 13B07F861A680F5B00A75B9A; }; 13B07F861A680F5B00A75B9A = { + DevelopmentTeam = S6UPZG7ZR3; ProvisioningStyle = Automatic; }; 2D02E47A1E0B4A5D006451C7 = { @@ -1378,7 +1381,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = S6UPZG7ZR3; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/realm/src/**", @@ -1411,7 +1414,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = S6UPZG7ZR3; HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/realm/src/**", diff --git a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN-tvOS.xcscheme b/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN-tvOS.xcscheme index 67650fedc..28cab8b16 100644 --- a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN-tvOS.xcscheme +++ b/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN-tvOS.xcscheme @@ -1,6 +1,6 @@ Date: Wed, 1 Nov 2017 17:31:31 -0200 Subject: [PATCH 28/48] Add deployment --- circle.yml | 25 +++++++++++++++++++--- ios/RocketChatRN.xcodeproj/project.pbxproj | 4 ++-- ios/RocketChatRN/Info.plist | 8 +++---- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/circle.yml b/circle.yml index 3d30cd0d6..07aeb8344 100644 --- a/circle.yml +++ b/circle.yml @@ -27,9 +27,6 @@ dependencies: - mkdir -p ~/.gradle # Install node modules - yarn - - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ - - cd android && ./gradlew assembleRelease - - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS cache_directories: # Let's speed up the next build by cacheing installed dependencies @@ -41,3 +38,25 @@ dependencies: - /usr/local/android-sdk-linux/platforms/android-25 - /usr/local/android-sdk-linux/build-tools/25.0.0 - /usr/local/android-sdk-linux/extras/android/m2repository +test: + override: + - ./node_modules/.bin/react-native bundle --platform android --dev true --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ + - cd android && ./gradlew assembleRelease + - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS + +deployment: + production: # just a label; label names are completely up to you + branch: master + commands: + - ./gradlew publishApkRelease + -Dorg.gradle.project.track=production + beta: + branch: develop + commands: + - ./gradlew publishApkRelease + -Dorg.gradle.project.track=beta + alpha: + branch: circle-ci + commands: + - ./gradlew publishApkRelease + -Dorg.gradle.project.track=alpha diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index b2b2c3535..4a246f154 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -1400,7 +1400,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative; + PRODUCT_BUNDLE_IDENTIFIER = "chat.rocket.reactnative-chat.rocket.reactnative"; PRODUCT_NAME = RocketChatRN; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1433,7 +1433,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative; + PRODUCT_BUNDLE_IDENTIFIER = "chat.rocket.reactnative-chat.rocket.reactnative"; PRODUCT_NAME = RocketChatRN; PROVISIONING_PROFILE_SPECIFIER = ""; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index 9f1a11793..3808c9efa 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - Rocket.Chat.$(PRODUCT_NAME:rfc1034identifier) + chat.rocket.reactnative CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 0.1.0 CFBundleSignature ???? CFBundleVersion - 1 + 2 LSRequiresIPhoneOS NSAppTransportSecurity @@ -38,7 +38,7 @@ NSCameraUsageDescription Upload images from camera NSLocationWhenInUseUsageDescription - + NSPhotoLibraryUsageDescription Upload images from library UIAppFonts From 1e2c9afd6f79b431aa914492f41fd01ffd2fda27 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 17:34:36 -0200 Subject: [PATCH 29/48] remove node version --- circle.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/circle.yml b/circle.yml index 07aeb8344..b15a92b46 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,4 @@ machine: - node: - version: 8 xcode: version: '8.3' environment: From 25733e765f4c116defd0b3bcf551b1d9eab02740 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 17:35:45 -0200 Subject: [PATCH 30/48] remove node version --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index b15a92b46..6c3f0d34b 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,6 @@ machine: dependencies: pre: # Install YARN - - node -v - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/$KEYSTORE" - | if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then From 2dd63bc6e7219e62e8ec97bc1606e508c0fff4de Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 17:45:49 -0200 Subject: [PATCH 31/48] brew node --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 6c3f0d34b..fbc4e1378 100644 --- a/circle.yml +++ b/circle.yml @@ -10,6 +10,8 @@ machine: dependencies: pre: # Install YARN + - brew install node + - node -v - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/$KEYSTORE" - | if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then From e756e6912646c0a9c2abaeb43d13ed6c7b4bb8bf Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 17:50:39 -0200 Subject: [PATCH 32/48] android build only --- circle.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index fbc4e1378..a13fd21fa 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: - xcode: - version: '8.3' + node: + version: 8 environment: YARN_VERSION: 0.18.1 # Needed for Android SDK installation bash script (see below) @@ -10,7 +10,6 @@ machine: dependencies: pre: # Install YARN - - brew install node - node -v - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/$KEYSTORE" - | From e6cfbf10856976dffa9f24fc1bbe8c15136e22d1 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 18:07:15 -0200 Subject: [PATCH 33/48] osx container with android build lets go --- circle.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index a13fd21fa..926d3fc2a 100644 --- a/circle.yml +++ b/circle.yml @@ -1,11 +1,14 @@ machine: - node: - version: 8 + xcode: + version: '9.0' environment: YARN_VERSION: 0.18.1 # Needed for Android SDK installation bash script (see below) PATH: "${PATH}:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' + XCODE_SCHEME: "RocketChatRN" + XCODE_WORKSPACE: "platforms/ios" + XCODE_PROJECT: "RocketChatRN.xcodeproj" dependencies: pre: From bea9090ecb88547d6754147baafb426e3599b20d Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 18:08:07 -0200 Subject: [PATCH 34/48] version 9.0 has yarn already --- circle.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/circle.yml b/circle.yml index 926d3fc2a..75abe78b6 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,6 @@ machine: xcode: version: '9.0' environment: - YARN_VERSION: 0.18.1 # Needed for Android SDK installation bash script (see below) PATH: "${PATH}:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' @@ -15,10 +14,6 @@ dependencies: # Install YARN - node -v - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/$KEYSTORE" - - | - if [[ ! -e ~/.yarn/bin/yarn || $(yarn --version) != "${YARN_VERSION}" ]]; then - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION - fi override: # The Android Gradle build will need the Android signing keystore keys setup From 95604a71f0189f3081fa692f4b9dc1f65ee8ee5b Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 18:29:00 -0200 Subject: [PATCH 35/48] na loucura --- android/app/BUCK | 4 ++-- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 2 +- .../main/java/com/rocketchatrn/MainActivity.java | 2 +- .../java/com/rocketchatrn/MainApplication.java | 2 +- circle.yml | 16 +++++++--------- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/android/app/BUCK b/android/app/BUCK index ea619878b..a6395be89 100644 --- a/android/app/BUCK +++ b/android/app/BUCK @@ -45,12 +45,12 @@ android_library( android_build_config( name = "build_config", - package = "com.rocketchatrn", + package = "chat.rocket.reactnative", ) android_resource( name = "res", - package = "com.rocketchatrn", + package = "chat.rocket.reactnative", res = "src/main/res", ) diff --git a/android/app/build.gradle b/android/app/build.gradle index 0c971c347..4aa4add23 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -94,7 +94,7 @@ android { buildToolsVersion "25.0.1" defaultConfig { - applicationId "com.rocketchatrn" + applicationId "chat.rocket.reactnative" minSdkVersion 16 targetSdkVersion 22 versionCode 1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index d498890f4..2b5ce37cc 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/android/app/src/main/java/com/rocketchatrn/MainActivity.java b/android/app/src/main/java/com/rocketchatrn/MainActivity.java index 460d2b783..80d1f552e 100644 --- a/android/app/src/main/java/com/rocketchatrn/MainActivity.java +++ b/android/app/src/main/java/com/rocketchatrn/MainActivity.java @@ -1,4 +1,4 @@ -package com.rocketchatrn; +package chat.rocket.reactnative; import com.facebook.react.ReactActivity; diff --git a/android/app/src/main/java/com/rocketchatrn/MainApplication.java b/android/app/src/main/java/com/rocketchatrn/MainApplication.java index 70eacb0d0..71794a949 100644 --- a/android/app/src/main/java/com/rocketchatrn/MainApplication.java +++ b/android/app/src/main/java/com/rocketchatrn/MainApplication.java @@ -1,4 +1,4 @@ -package com.rocketchatrn; +package chat.rocket.reactnative; import android.app.Application; diff --git a/circle.yml b/circle.yml index 75abe78b6..9054b0646 100644 --- a/circle.yml +++ b/circle.yml @@ -2,12 +2,13 @@ machine: xcode: version: '9.0' environment: + YARN_VERSION: 0.18.1 # Needed for Android SDK installation bash script (see below) PATH: "${PATH}:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' - XCODE_SCHEME: "RocketChatRN" - XCODE_WORKSPACE: "platforms/ios" - XCODE_PROJECT: "RocketChatRN.xcodeproj" + XCODE_WORKSPACE: "${XCODE_PROJECT}/project.xcworkspace" + XCODE_PROJECT: "${HOME}/${CIRCLE_PROJECT_REPONAME}/ios/RocketChatRN.xcodeproj" + XCODE_SCHEME: "${XCODE_PROJECT}/xcshareddata/xcschemes/RocketChatRN.xcschemeRocketChatRN" dependencies: pre: @@ -23,6 +24,9 @@ dependencies: - mkdir -p ~/.gradle # Install node modules - yarn + - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ + - cd android && ./gradlew assembleRelease + - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS cache_directories: # Let's speed up the next build by cacheing installed dependencies @@ -34,12 +38,6 @@ dependencies: - /usr/local/android-sdk-linux/platforms/android-25 - /usr/local/android-sdk-linux/build-tools/25.0.0 - /usr/local/android-sdk-linux/extras/android/m2repository -test: - override: - - ./node_modules/.bin/react-native bundle --platform android --dev true --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ - - cd android && ./gradlew assembleRelease - - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS - deployment: production: # just a label; label names are completely up to you branch: master From f376145d2bf31d00b3d527a761ac1a7d196bdf3c Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 18:38:08 -0200 Subject: [PATCH 36/48] changing xcode env path --- circle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 9054b0646..ce085813e 100644 --- a/circle.yml +++ b/circle.yml @@ -6,9 +6,8 @@ machine: # Needed for Android SDK installation bash script (see below) PATH: "${PATH}:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' - XCODE_WORKSPACE: "${XCODE_PROJECT}/project.xcworkspace" XCODE_PROJECT: "${HOME}/${CIRCLE_PROJECT_REPONAME}/ios/RocketChatRN.xcodeproj" - XCODE_SCHEME: "${XCODE_PROJECT}/xcshareddata/xcschemes/RocketChatRN.xcschemeRocketChatRN" + XCODE_SCHEME: "${HOME}/${CIRCLE_PROJECT_REPONAME}/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme" dependencies: pre: From 40cf70afa0121268c6b66d72e7867b352bc6deed Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 18:56:25 -0200 Subject: [PATCH 37/48] xcode --- circle.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index ce085813e..936640212 100644 --- a/circle.yml +++ b/circle.yml @@ -1,14 +1,11 @@ machine: - xcode: - version: '9.0' + node: + version: 8 environment: YARN_VERSION: 0.18.1 # Needed for Android SDK installation bash script (see below) PATH: "${PATH}:${HOME}/.yarn/bin:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"' - XCODE_PROJECT: "${HOME}/${CIRCLE_PROJECT_REPONAME}/ios/RocketChatRN.xcodeproj" - XCODE_SCHEME: "${HOME}/${CIRCLE_PROJECT_REPONAME}/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme" - dependencies: pre: # Install YARN From 7a98caa524559cc885c63e4f4ab8512f6bea3d4c Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 19:14:04 -0200 Subject: [PATCH 38/48] add android --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 936640212..2344548e0 100644 --- a/circle.yml +++ b/circle.yml @@ -34,6 +34,7 @@ dependencies: - /usr/local/android-sdk-linux/platforms/android-25 - /usr/local/android-sdk-linux/build-tools/25.0.0 - /usr/local/android-sdk-linux/extras/android/m2repository + deployment: production: # just a label; label names are completely up to you branch: master @@ -48,5 +49,5 @@ deployment: alpha: branch: circle-ci commands: - - ./gradlew publishApkRelease + - ./android/gradlew publishApkRelease -Dorg.gradle.project.track=alpha From 3a7523f74f5b1d1bc2642e9f24002f268871a917 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Wed, 1 Nov 2017 19:30:37 -0200 Subject: [PATCH 39/48] remove wrong build --- circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 2344548e0..65a210fd2 100644 --- a/circle.yml +++ b/circle.yml @@ -39,15 +39,15 @@ deployment: production: # just a label; label names are completely up to you branch: master commands: - - ./gradlew publishApkRelease + - ./gradlew assembleRelease -Dorg.gradle.project.track=production beta: branch: develop commands: - - ./gradlew publishApkRelease + - ./gradlew assembleRelease -Dorg.gradle.project.track=beta alpha: branch: circle-ci commands: - - ./android/gradlew publishApkRelease + - ./android/gradlew assembleRelease -Dorg.gradle.project.track=alpha From d56e76097ad373dfd8b443b21c1774ef9f70f701 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 2 Nov 2017 19:53:04 -0200 Subject: [PATCH 40/48] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 65a210fd2..9a05f14bd 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,7 @@ dependencies: pre: # Install YARN - node -v - - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/$KEYSTORE" + - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/app/$KEYSTORE" override: # The Android Gradle build will need the Android signing keystore keys setup From b9c050559cb3820a549a10f71bd153d830c220c0 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Thu, 2 Nov 2017 19:54:10 -0200 Subject: [PATCH 41/48] Update build.gradle --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 4aa4add23..5149e4fe7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,7 +105,7 @@ android { } signingConfigs { release { - storeFile project.rootProject.file(System.getenv("KEYSTORE")).getCanonicalFile() + storeFile file(System.getenv("KEYSTORE")) storePassword System.getenv("KEYSTORE_PASSWORD") keyAlias System.getenv("KEY_ALIAS") keyPassword System.getenv("KEY_PASSWORD") From 55503de44f649fba9e08f5fe1988362251e16841 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 3 Nov 2017 15:28:07 -0200 Subject: [PATCH 42/48] update --- circle.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 9a05f14bd..1a4949d19 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,11 @@ dependencies: pre: # Install YARN - node -v - - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/app/$KEYSTORE" + - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "./android/app/$KEYSTORE" + - echo -e "KEYSTORE=$KEYSTORE" > ./android/gradle.properties + - echo -e "KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD" >> ./android/gradle.properties + - echo -e "KEY_ALIAS=$KEY_ALIAS" >> ./android/gradle.properties + - echo -e "KEY_PASSWORD=$KEYSTORE_PASSWORD" >> ./android/gradle.properties override: # The Android Gradle build will need the Android signing keystore keys setup From 53a16847c3844b841e1e51588f8b51851bfa4e2f Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Fri, 3 Nov 2017 15:47:21 -0200 Subject: [PATCH 43/48] check deployment path --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/circle.yml b/circle.yml index 1a4949d19..b9eff0b1b 100644 --- a/circle.yml +++ b/circle.yml @@ -53,5 +53,8 @@ deployment: alpha: branch: circle-ci commands: + - ls + - cd ${HOME}/${CIRCLE_PROJECT_REPONAME} + - ls - ./android/gradlew assembleRelease -Dorg.gradle.project.track=alpha From b6fa5a9db162e4ef2fd67e9dadb1b788207cf95e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 3 Nov 2017 15:28:07 -0200 Subject: [PATCH 44/48] update --- circle.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 9a05f14bd..2dafadcc5 100644 --- a/circle.yml +++ b/circle.yml @@ -10,14 +10,17 @@ dependencies: pre: # Install YARN - node -v - - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "android/app/$KEYSTORE" + - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "./android/app/$KEYSTORE" + - echo -e "KEYSTORE=$KEYSTORE" > ./android/gradle.properties + - echo -e "KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD" >> ./android/gradle.properties + - echo -e "KEY_ALIAS=$KEY_ALIAS" >> ./android/gradle.properties + - echo -e "KEY_PASSWORD=$KEYSTORE_PASSWORD" >> ./android/gradle.properties override: # The Android Gradle build will need the Android signing keystore keys setup - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-23.0.3,build-tools-25.0.2,build-tools-26.0.1,android-23,extra-google-m2repository,extra-google-google_play_services,extra-android-m2repository - echo y | $ANDROID_HOME/tools/bin/sdkmanager --update - echo y | $ANDROID_HOME/tools/bin/sdkmanager --licenses - - mkdir -p ~/.gradle # Install node modules - yarn - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ @@ -49,5 +52,4 @@ deployment: alpha: branch: circle-ci commands: - - ./android/gradlew assembleRelease - -Dorg.gradle.project.track=alpha + - android/gradlew publishApkProductionRelease From 0337072aa6f1e4e7644ecf8096475206cede6ce8 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Fri, 3 Nov 2017 17:11:27 -0200 Subject: [PATCH 45/48] fix deployment --- circle.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index b9eff0b1b..f01d65201 100644 --- a/circle.yml +++ b/circle.yml @@ -53,8 +53,5 @@ deployment: alpha: branch: circle-ci commands: - - ls - - cd ${HOME}/${CIRCLE_PROJECT_REPONAME} - - ls - - ./android/gradlew assembleRelease + - cd android && ./gradlew assembleRelease -Dorg.gradle.project.track=alpha From 3a048661e8228e2d7235099620362c84a4ec875e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 3 Nov 2017 18:14:50 -0200 Subject: [PATCH 46/48] update --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 704681cfd..7c053bb36 100644 --- a/circle.yml +++ b/circle.yml @@ -23,7 +23,7 @@ dependencies: - echo y | $ANDROID_HOME/tools/bin/sdkmanager --licenses # Install node modules - yarn - - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ + # - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ - cd android && ./gradlew assembleRelease - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS From abfea9226abea857f582c21210806364c1c0270e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 3 Nov 2017 18:43:20 -0200 Subject: [PATCH 47/48] ? --- android/app/build.gradle | 12 +++++++----- circle.yml | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 5149e4fe7..a256a2800 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -105,11 +105,13 @@ android { } signingConfigs { release { - storeFile file(System.getenv("KEYSTORE")) - storePassword System.getenv("KEYSTORE_PASSWORD") - keyAlias System.getenv("KEY_ALIAS") - keyPassword System.getenv("KEY_PASSWORD") - } + if (project.hasProperty('KEYSTORE')) { + storeFile file(KEYSTORE) + storePassword KEYSTORE_PASSWORD + keyAlias KEY_ALIAS + keyPassword KEY_PASSWORD + } + } } splits { abi { diff --git a/circle.yml b/circle.yml index 7c053bb36..361f85172 100644 --- a/circle.yml +++ b/circle.yml @@ -10,8 +10,8 @@ dependencies: pre: # Install YARN - node -v - - echo $KEYSTORE_BASE64 | base64 --decode | tee -a "./android/app/$KEYSTORE" - - echo -e "KEYSTORE=$KEYSTORE" > ./android/gradle.properties + - echo $KEYSTORE_BASE64 | base64 --decode > ./android/app/rocketchat-rn.keystore + - echo -e "KEYSTORE=$KEYSTORE" >> ./android/gradle.properties - echo -e "KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD" >> ./android/gradle.properties - echo -e "KEY_ALIAS=$KEY_ALIAS" >> ./android/gradle.properties - echo -e "KEY_PASSWORD=$KEYSTORE_PASSWORD" >> ./android/gradle.properties From b1f82be0c9a8dcc966923c129411153922915f3e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 3 Nov 2017 19:04:24 -0200 Subject: [PATCH 48/48] . --- circle.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 361f85172..eb23ee142 100644 --- a/circle.yml +++ b/circle.yml @@ -24,8 +24,8 @@ dependencies: # Install node modules - yarn # - ./node_modules/.bin/react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ - - cd android && ./gradlew assembleRelease - - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS + # - cd android && ./gradlew assembleRelease + # - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS cache_directories: # Let's speed up the next build by cacheing installed dependencies @@ -53,4 +53,5 @@ deployment: branch: circle-ci commands: - cd android && ./gradlew assembleRelease - -Dorg.gradle.project.track=alpha + - mv ./android/app/build/outputs/ $CIRCLE_ARTIFACTS + # -Dorg.gradle.project.track=alpha