diff --git a/.circleci/config.yml b/.circleci/config.yml index 248747b3a..14ba8f40b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,13 +53,30 @@ save-gems-cache: &save-gems-cache paths: - vendor/bundle -update-fastlane: &update-fastlane +update-fastlane-ios: &update-fastlane-ios name: Update Fastlane command: | echo "ruby-2.6.4" > ~/.ruby-version bundle install working_directory: ios +update-fastlane-android: &update-fastlane-android + name: Update Fastlane + command: | + echo "ruby-2.6.4" > ~/.ruby-version + bundle install + working_directory: android + +save-gradle-cache: &save-gradle-cache + name: Save gradle cache + key: android-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }} + paths: + - ~/.gradle + +restore_cache: &restore-gradle-cache + name: Restore gradle cache + key: android-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }} + restore-brew-cache: &restore-brew-cache name: Restore Brew cache key: brew-{{ checksum "yarn.lock" }}-{{ checksum ".circleci/config.yml" }} @@ -227,9 +244,9 @@ jobs: - run: *install-npm-modules - - restore_cache: - name: Restore gradle cache - key: android-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }} + - run: *update-fastlane-android + + - restore_cache: *restore-gradle-cache - run: name: Configure Gradle @@ -267,14 +284,10 @@ jobs: name: Build Android App command: | if [[ $KEYSTORE ]]; then - ./gradlew bundleRelease + bundle exec fastlane android release else - ./gradlew assembleDebug + bundle exec fastlane android build fi - - mkdir -p /tmp/build - - mv app/build/outputs /tmp/build/ working_directory: android - run: @@ -291,15 +304,40 @@ jobs: fi - store_artifacts: - path: /tmp/build/outputs + path: android/app/build/outputs - save_cache: *save-npm-cache-linux - - save_cache: - name: Save gradle cache - key: android-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }} + - save_cache: *save-gradle-cache + + - persist_to_workspace: + root: . paths: - - ~/.gradle + - android/fastlane/report.xml + - android/app/build/outputs + + android-google-play-alpha: + <<: *defaults + docker: + - image: circleci/android:api-28-node + + steps: + - checkout + + - attach_workspace: + at: android + + - run: + name: Store the google service account key + command: echo "$FASTLANE_GOOGLE_SERVICE_ACCOUNT" | base64 --decode > service_account.json + working_directory: android + + - run: *update-fastlane-android + + - run: + name: Fastlane Play Store Upload + command: bundle exec fastlane android alpha + working_directory: android # iOS builds ios-build: @@ -316,7 +354,7 @@ jobs: - run: *install-npm-modules - - run: *update-fastlane + - run: *update-fastlane-ios - run: name: Set Google Services @@ -378,7 +416,7 @@ jobs: - restore_cache: *restore-gems-cache - - run: *update-fastlane + - run: *update-fastlane-ios - run: name: Fastlane Tesflight Upload @@ -424,3 +462,10 @@ workflows: - android-build: requires: - lint-testunit + - android-hold-google-play-alpha: + type: approval + requires: + - android-build + - android-google-play-alpha: + requires: + - android-hold-google-play-alpha diff --git a/.gitignore b/.gitignore index cc34f4320..6e797d850 100644 --- a/.gitignore +++ b/.gitignore @@ -51,9 +51,10 @@ buck-out/ # For more information about the recommended setup visit: # https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots +**/fastlane/report.xml +**/fastlane/Preview.html +**/fastlane/screenshots +**/fastlane/test_output coverage diff --git a/android/Gemfile b/android/Gemfile new file mode 100644 index 000000000..cdd3a6b34 --- /dev/null +++ b/android/Gemfile @@ -0,0 +1,6 @@ +source "https://rubygems.org" + +gem "fastlane" + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/android/Gemfile.lock b/android/Gemfile.lock new file mode 100644 index 000000000..0c51b23fc --- /dev/null +++ b/android/Gemfile.lock @@ -0,0 +1,181 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + atomos (0.1.3) + aws-eventstream (1.0.3) + aws-partitions (1.294.0) + aws-sdk-core (3.92.0) + aws-eventstream (~> 1.0, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.61.2) + aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.1) + aws-eventstream (~> 1.0, >= 1.0.2) + babosa (1.0.3) + claide (1.0.3) + colored (1.2) + colored2 (3.1.2) + commander-fastlane (4.4.6) + highline (~> 1.7.2) + declarative (0.0.10) + declarative-option (0.1.0) + digest-crc (0.5.1) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.5) + emoji_regex (1.0.1) + excon (0.73.0) + faraday (0.17.3) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + faraday_middleware (0.13.1) + faraday (>= 0.7.4, < 1.0) + fastimage (2.1.7) + fastlane (2.145.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.3, < 3.0.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.2, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander-fastlane (>= 4.4.6, < 5.0.0) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 2.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 0.17) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 0.13.1) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-api-client (>= 0.29.2, < 0.37.0) + google-cloud-storage (>= 1.15.0, < 2.0.0) + highline (>= 1.7.2, < 2.0.0) + json (< 3.0.0) + jwt (~> 2.1.0) + mini_magick (>= 4.9.4, < 5.0.0) + multi_xml (~> 0.5) + multipart-post (~> 2.0.0) + plist (>= 3.1.0, < 4.0.0) + public_suffix (~> 2.0.0) + rubyzip (>= 1.3.0, < 2.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + slack-notifier (>= 2.0.0, < 3.0.0) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + fastlane-plugin-appcenter (1.8.0) + gh_inspector (1.1.3) + google-api-client (0.36.4) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.9) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + signet (~> 0.12) + google-cloud-core (1.5.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.3.1) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.0.0) + google-cloud-storage (1.25.1) + addressable (~> 2.5) + digest-crc (~> 0.4) + google-api-client (~> 0.33) + google-cloud-core (~> 1.2) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.11.0) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.12) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.4.0) + json (2.3.0) + jwt (2.1.0) + memoist (0.16.2) + mini_magick (4.10.1) + mini_mime (1.0.2) + multi_json (1.14.1) + multi_xml (0.6.0) + multipart-post (2.0.0) + nanaimo (0.2.6) + naturally (2.2.0) + os (1.1.0) + plist (3.5.0) + public_suffix (2.0.5) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rouge (2.0.7) + rubyzip (1.3.0) + security (0.1.3) + signet (0.14.0) + addressable (~> 2.3) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + slack-notifier (2.3.2) + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + tty-cursor (0.7.1) + tty-screen (0.7.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7-x64-mingw32) + unicode-display_width (1.7.0) + word_wrap (1.0.0) + xcodeproj (1.15.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.0) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + x64-mingw32 + +DEPENDENCIES + fastlane + fastlane-plugin-appcenter + +BUNDLED WITH + 2.0.2 diff --git a/android/fastlane/Appfile b/android/fastlane/Appfile new file mode 100644 index 000000000..32b85836b --- /dev/null +++ b/android/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("service_account.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("chat.rocket.reactnative") diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile new file mode 100644 index 000000000..e74a5b43f --- /dev/null +++ b/android/fastlane/Fastfile @@ -0,0 +1,36 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:android) + +platform :android do + desc "Build App for development" + lane :build do + gradle(task: "assembleDebug") + end + + desc "Build App for release" + lane :release do + gradle(task: "bundleRelease") + end + + desc "Upload App to Play store" + lane :alpha do + upload_to_play_store( + track: 'alpha', + aab: 'android/app/build/outputs/bundle/release/app-release.aab' + ) + end +end diff --git a/android/fastlane/Pluginfile b/android/fastlane/Pluginfile new file mode 100644 index 000000000..cbbb56bde --- /dev/null +++ b/android/fastlane/Pluginfile @@ -0,0 +1,5 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + + diff --git a/android/fastlane/README.md b/android/fastlane/README.md new file mode 100644 index 000000000..3031222f9 --- /dev/null +++ b/android/fastlane/README.md @@ -0,0 +1,39 @@ +fastlane documentation +================ +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +``` +xcode-select --install +``` + +Install _fastlane_ using +``` +[sudo] gem install fastlane -NV +``` +or alternatively using `brew cask install fastlane` + +# Available Actions +## Android +### android build +``` +fastlane android build +``` +Build App for development +### android release +``` +fastlane android release +``` +Build App for release +### android alpha +``` +fastlane android alpha +``` +Upload App to Play store + +---- + +This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run. +More information about fastlane can be found on [fastlane.tools](https://fastlane.tools). +The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).