From b67422f362653eea72ae0defd6f8dc647ce83add Mon Sep 17 00:00:00 2001 From: AbulAsar Date: Mon, 14 Oct 2019 19:10:08 +0530 Subject: [PATCH 01/10] upgraded lodash and lodash merge --- package.json | 3 ++- yarn.lock | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 94515534..0f54d92e 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,8 @@ "hoek": "4.2.1", "js-yaml": "^3.13.1", "loader.js": "4.0.0", - "lodash": "^4.17.11", + "lodash": "^4.17.13", + "lodash.merge": "^4.6.2", "minimatch": "^3.0.2", "phantomjs-prebuilt": "^2.1.14", "shared-goodcity": "git://github.com/crossroads/shared.goodcity.git#master", diff --git a/yarn.lock b/yarn.lock index f8bc7eed..edf9ed4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7384,6 +7384,11 @@ lodash.merge@^4.3.0, lodash.merge@^4.3.1, lodash.merge@^4.4.0, lodash.merge@^4.6 resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ== +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + lodash.mergewith@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" @@ -7507,6 +7512,11 @@ lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.3.0, resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.17.13: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + lodash@~2.4.1: version "2.4.2" resolved "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e" From b5ef75b198cc47ebfbb09fd88ae2ac5e7df3e805 Mon Sep 17 00:00:00 2001 From: AbulAsar Date: Thu, 17 Oct 2019 16:03:12 +0530 Subject: [PATCH 02/10] upgrade rubyzip --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d5584408..31d07ee3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,7 @@ GEM retriable (3.1.2) rouge (2.0.7) ruby-macho (1.3.1) - rubyzip (1.2.3) + rubyzip (1.3.0) security (0.1.3) signet (0.11.0) addressable (~> 2.3) From facd7b80f5204f17d4b940934735e6cbf1cc4fcc Mon Sep 17 00:00:00 2001 From: namrataukirde Date: Mon, 4 Nov 2019 14:39:10 +0530 Subject: [PATCH 03/10] upgrade android api to 28 --- .circleci/config.yml | 4 +++- cordova/config.xml | 4 ++-- fastlane/Fastfile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c80b831..8a21edce 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -185,12 +185,14 @@ jobs: yarn run azure-filestore download -d google-play -f $GOOGLE_PLAY_KEY_FILE mv $GOOGLE_PLAY_KEY_FILE ~/code/fastlane working_directory: ~/code + - run: yes | sdkmanager --licenses || exit 0 + - run: yes | sdkmanager --update || exit 0 - run: name: android build command: bundle exec rake ${ENVIRONMENT} android app:build working_directory: ~/code/cordova - store_artifacts: - path: cordova/platforms/android/build/outputs/apk/ + path: cordova/platforms/android/app/build/outputs/apk/ - run: name: release android build command: bundle exec fastlane android ${ENVIRONMENT} diff --git a/cordova/config.xml b/cordova/config.xml index 25d4e237..3440729e 100755 --- a/cordova/config.xml +++ b/cordova/config.xml @@ -8,7 +8,7 @@ - + @@ -88,7 +88,7 @@ - + diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e0a43753..924e671c 100755 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -64,7 +64,7 @@ end platform :android do before_all do - apk_file_path = Dir["#{ENV["CIRCLE_ARTIFACTS"]}/*.apk"].first + apk_file_path = Dir["/home/circleci/code/cordova/platforms/android/app/build/outputs/apk/debug/*.apk"].first ENV["SUPPLY_APK"] = ENV["TESTFAIRY_IPA_PATH"] = apk_file_path raise_if_no_env_var("GOOGLE_PLAY_KEY_FILE") ENV["SUPPLY_JSON_KEY"] = File.join(Dir.pwd, ENV["GOOGLE_PLAY_KEY_FILE"]) From b9ff2a9e458553c7c2899a642d64d3e36a55665d Mon Sep 17 00:00:00 2001 From: namrataukirde Date: Mon, 4 Nov 2019 22:59:31 +0530 Subject: [PATCH 04/10] check apk path for release build --- .circleci/config.yml | 8 ++++---- Rakefile | 6 ++++-- fastlane/Fastfile | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a21edce..6c16fa74 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -354,25 +354,25 @@ workflows: - tests filters: branches: - only: /^(master|live)$/ + only: /^(GCW-2854-upgrade-android-28|live)$/ - www_deploy: requires: - www_build filters: branches: - only: /^(master|live)$/ + only: /^(GCW-2854-upgrade-android-28|live)$/ - ember_cordova_build: requires: - tests filters: branches: - only: /^(master|live)$/ + only: /^(GCW-2854-upgrade-android-28|live)$/ - android_build_and_deploy: requires: - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(GCW-2854-upgrade-android-28|live)$/ - ios_build_and_deploy: requires: - tests diff --git a/Rakefile b/Rakefile index bc8992ab..5ff31c85 100755 --- a/Rakefile +++ b/Rakefile @@ -109,7 +109,8 @@ namespace :cordova do else sh %{ cordova plugin add phonegap-plugin-push@1.9.2 --variable SENDER_ID="XXXXXXX" } end - build = (environment == "staging" && platform == 'android') ? "debug" : "release" + # build = (environment == "staging" && platform == 'android') ? "debug" : "release" + build = "release" extra_params = (platform === "android") ? '' : ios_build_config system({"ENVIRONMENT" => environment}, "cordova compile #{platform} --#{build} --device #{extra_params}") end @@ -235,7 +236,8 @@ def app_file when /ios/ "#{CORDOVA_PATH}/platforms/ios/build/device/#{app_name}.ipa" when /android/ - build = is_staging ? "debug" : "release" + build = "release" + # build = is_staging ? "debug" : "release" "#{CORDOVA_PATH}/platforms/android/build/outputs/apk/android-#{build}.apk" when /windows/ raise(BuildError, "TODO: Need to get Windows app path") diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 924e671c..df9b29e1 100755 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -64,7 +64,7 @@ end platform :android do before_all do - apk_file_path = Dir["/home/circleci/code/cordova/platforms/android/app/build/outputs/apk/debug/*.apk"].first + apk_file_path = Dir["/home/circleci/code/cordova/platforms/android/app/build/outputs/apk/*/*.apk"].first ENV["SUPPLY_APK"] = ENV["TESTFAIRY_IPA_PATH"] = apk_file_path raise_if_no_env_var("GOOGLE_PLAY_KEY_FILE") ENV["SUPPLY_JSON_KEY"] = File.join(Dir.pwd, ENV["GOOGLE_PLAY_KEY_FILE"]) From 08cdabbf8926a045929c65b94837a23784a2cd7c Mon Sep 17 00:00:00 2001 From: namrataukirde Date: Tue, 5 Nov 2019 00:22:42 +0530 Subject: [PATCH 05/10] GCW-2854 revert changes did to check release apk --- .circleci/config.yml | 8 ++++---- Rakefile | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c16fa74..9aa89197 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -185,8 +185,8 @@ jobs: yarn run azure-filestore download -d google-play -f $GOOGLE_PLAY_KEY_FILE mv $GOOGLE_PLAY_KEY_FILE ~/code/fastlane working_directory: ~/code - - run: yes | sdkmanager --licenses || exit 0 - - run: yes | sdkmanager --update || exit 0 + - run: yes | sdkmanager --licenses || exit 1 + - run: yes | sdkmanager --update || exit 1 - run: name: android build command: bundle exec rake ${ENVIRONMENT} android app:build @@ -372,11 +372,11 @@ workflows: - ember_cordova_build filters: branches: - only: /^(GCW-2854-upgrade-android-28|live)$/ + only: /^(master|live)$/ - ios_build_and_deploy: requires: - tests filters: branches: - only: /^(live|master)$/ + only: /^(master|live)$/ diff --git a/Rakefile b/Rakefile index 5ff31c85..bc8992ab 100755 --- a/Rakefile +++ b/Rakefile @@ -109,8 +109,7 @@ namespace :cordova do else sh %{ cordova plugin add phonegap-plugin-push@1.9.2 --variable SENDER_ID="XXXXXXX" } end - # build = (environment == "staging" && platform == 'android') ? "debug" : "release" - build = "release" + build = (environment == "staging" && platform == 'android') ? "debug" : "release" extra_params = (platform === "android") ? '' : ios_build_config system({"ENVIRONMENT" => environment}, "cordova compile #{platform} --#{build} --device #{extra_params}") end @@ -236,8 +235,7 @@ def app_file when /ios/ "#{CORDOVA_PATH}/platforms/ios/build/device/#{app_name}.ipa" when /android/ - build = "release" - # build = is_staging ? "debug" : "release" + build = is_staging ? "debug" : "release" "#{CORDOVA_PATH}/platforms/android/build/outputs/apk/android-#{build}.apk" when /windows/ raise(BuildError, "TODO: Need to get Windows app path") From b22edfb80f0111aaea4700deb50570aa1d7e8078 Mon Sep 17 00:00:00 2001 From: namrataukirde Date: Tue, 5 Nov 2019 15:39:43 +0530 Subject: [PATCH 06/10] use environment variable for apk path --- .circleci/config.yml | 6 +++--- fastlane/Fastfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9aa89197..3b05998b 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -185,8 +185,8 @@ jobs: yarn run azure-filestore download -d google-play -f $GOOGLE_PLAY_KEY_FILE mv $GOOGLE_PLAY_KEY_FILE ~/code/fastlane working_directory: ~/code - - run: yes | sdkmanager --licenses || exit 1 - - run: yes | sdkmanager --update || exit 1 + - run: yes | sdkmanager --licenses || exit 0 + - run: yes | sdkmanager --update || exit 0 - run: name: android build command: bundle exec rake ${ENVIRONMENT} android app:build @@ -372,7 +372,7 @@ workflows: - ember_cordova_build filters: branches: - only: /^(master|live)$/ + only: /^(GCW-2854-upgrade-android-28|live)$/ - ios_build_and_deploy: requires: - tests diff --git a/fastlane/Fastfile b/fastlane/Fastfile index df9b29e1..40eb2189 100755 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -64,8 +64,8 @@ end platform :android do before_all do - apk_file_path = Dir["/home/circleci/code/cordova/platforms/android/app/build/outputs/apk/*/*.apk"].first - ENV["SUPPLY_APK"] = ENV["TESTFAIRY_IPA_PATH"] = apk_file_path + # apk_file_path = Dir["/home/circleci/code/cordova/platforms/android/app/build/outputs/apk/*/*.apk"].first + ENV["SUPPLY_APK"] = ENV["TESTFAIRY_IPA_PATH"] = DIR[ENV["APK_FILE_PATH"]].first raise_if_no_env_var("GOOGLE_PLAY_KEY_FILE") ENV["SUPPLY_JSON_KEY"] = File.join(Dir.pwd, ENV["GOOGLE_PLAY_KEY_FILE"]) raise "Google Play private key file not found! (#{ENV["SUPPLY_JSON_KEY"]})" unless File.exist?(ENV["SUPPLY_JSON_KEY"]) From 5f755d498f8f1ec2f00fee7f544cf56aafdda36c Mon Sep 17 00:00:00 2001 From: namrataukirde Date: Tue, 5 Nov 2019 16:00:33 +0530 Subject: [PATCH 07/10] use environment variable for apk path --- .circleci/config.yml | 8 ++++---- Gemfile.lock | 40 ++++++++++++++++++++-------------------- fastlane/Fastfile | 3 +-- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3b05998b..e27792de 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -354,25 +354,25 @@ workflows: - tests filters: branches: - only: /^(GCW-2854-upgrade-android-28|live)$/ + only: /^(master|live)$/ - www_deploy: requires: - www_build filters: branches: - only: /^(GCW-2854-upgrade-android-28|live)$/ + only: /^(master|live)$/ - ember_cordova_build: requires: - tests filters: branches: - only: /^(GCW-2854-upgrade-android-28|live)$/ + only: /^(master|live)$/ - android_build_and_deploy: requires: - ember_cordova_build filters: branches: - only: /^(GCW-2854-upgrade-android-28|live)$/ + only: /^(master|live)$/ - ios_build_and_deploy: requires: - tests diff --git a/Gemfile.lock b/Gemfile.lock index d5584408..523e8c27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,16 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.0) + CFPropertyList (3.0.1) activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) atomos (0.1.3) - babosa (1.0.2) + babosa (1.0.3) capistrano (3.4.0) i18n rake (>= 10.0.0) @@ -62,16 +62,16 @@ GEM dotenv (2.7.5) emoji_regex (1.0.1) escape (0.0.4) - excon (0.66.0) - faraday (0.15.4) + excon (0.68.0) + faraday (0.17.0) 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.5) - fastlane (2.128.1) + fastimage (2.1.7) + fastlane (2.134.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -81,9 +81,9 @@ GEM dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 2.0) excon (>= 0.45.0, < 1.0.0) - faraday (~> 0.9) + faraday (~> 0.17) faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 0.9) + faraday_middleware (~> 0.13.1) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-api-client (>= 0.21.2, < 0.24.0) @@ -96,7 +96,7 @@ GEM multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) public_suffix (~> 2.0.0) - rubyzip (>= 1.2.2, < 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) @@ -119,9 +119,9 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.9) - google-cloud-core (1.3.0) + google-cloud-core (1.4.1) google-cloud-env (~> 1.0) - google-cloud-env (1.2.0) + google-cloud-env (1.3.0) faraday (~> 0.11) google-cloud-storage (1.16.0) digest-crc (~> 0.4) @@ -144,14 +144,14 @@ GEM json (2.2.0) jwt (2.1.0) memoist (0.16.0) - mime-types (3.2.2) + mime-types (3.3) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mime-types-data (3.2019.1009) mini_magick (4.9.5) mini_portile2 (2.4.0) minitest (5.11.3) molinillo (0.6.6) - multi_json (1.13.1) + multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.6) @@ -174,14 +174,14 @@ GEM retriable (3.1.2) rouge (2.0.7) ruby-macho (1.3.1) - rubyzip (1.2.3) + rubyzip (1.3.0) security (0.1.3) - signet (0.11.0) + signet (0.12.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.5) + simctl (1.6.6) CFPropertyList naturally slack-notifier (2.3.2) @@ -204,7 +204,7 @@ GEM unf_ext (0.0.7.6) unicode-display_width (1.6.0) word_wrap (1.0.0) - xcodeproj (1.12.0) + xcodeproj (1.13.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 40eb2189..7c5842f1 100755 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -64,8 +64,7 @@ end platform :android do before_all do - # apk_file_path = Dir["/home/circleci/code/cordova/platforms/android/app/build/outputs/apk/*/*.apk"].first - ENV["SUPPLY_APK"] = ENV["TESTFAIRY_IPA_PATH"] = DIR[ENV["APK_FILE_PATH"]].first + ENV["SUPPLY_APK"] = ENV["TESTFAIRY_IPA_PATH"] = Dir["#{ENV["APK_FILE_PATH"]}"].first raise_if_no_env_var("GOOGLE_PLAY_KEY_FILE") ENV["SUPPLY_JSON_KEY"] = File.join(Dir.pwd, ENV["GOOGLE_PLAY_KEY_FILE"]) raise "Google Play private key file not found! (#{ENV["SUPPLY_JSON_KEY"]})" unless File.exist?(ENV["SUPPLY_JSON_KEY"]) From e139bbc6fbe18d9adbf4abd35b861e01ed3c0950 Mon Sep 17 00:00:00 2001 From: namrataukirde Date: Tue, 5 Nov 2019 17:40:57 +0530 Subject: [PATCH 08/10] fix syntax error --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 7c5842f1..6cb42ab7 100755 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -64,7 +64,7 @@ end platform :android do before_all do - ENV["SUPPLY_APK"] = ENV["TESTFAIRY_IPA_PATH"] = Dir["#{ENV["APK_FILE_PATH"]}"].first + ENV["SUPPLY_APK"] = ENV["TESTFAIRY_IPA_PATH"] = Dir["#{ENV['APK_FILE_PATH']}"].first raise_if_no_env_var("GOOGLE_PLAY_KEY_FILE") ENV["SUPPLY_JSON_KEY"] = File.join(Dir.pwd, ENV["GOOGLE_PLAY_KEY_FILE"]) raise "Google Play private key file not found! (#{ENV["SUPPLY_JSON_KEY"]})" unless File.exist?(ENV["SUPPLY_JSON_KEY"]) From c1c9a215b30173a8d5491b1642881b54336a7788 Mon Sep 17 00:00:00 2001 From: namrataukirde Date: Wed, 6 Nov 2019 13:46:19 +0530 Subject: [PATCH 09/10] add new development certificate and staging provisioning profile --- .circleci/config.yml | 4 ++-- Gemfile.lock | 2 +- Rakefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e27792de..cc507e92 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -220,8 +220,8 @@ jobs: command: | echo 'export STAGING=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo false; else echo true; fi)' >> $BASH_ENV echo 'export ENVIRONMENT=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo production; else echo staging; fi)' >> $BASH_ENV - echo 'export PROVISIONING_PROFILE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'GoodCityDonor.mobileprovision'; else echo 'GoodCity_App_Staging.mobileprovision'; fi)' >> $BASH_ENV - echo 'export CERTIFICATE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'Goodcity_2020.p12'; else echo 'GoodCity_2019_Development.p12'; fi)' >> $BASH_ENV + echo 'export PROVISIONING_PROFILE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'GoodCityDonor.mobileprovision'; else echo 'GoodCityAppStaging.mobileprovision'; fi)' >> $BASH_ENV + echo 'export CERTIFICATE=$(if [ "$CIRCLE_BRANCH" == "live" ]; then echo 'Goodcity_2020.p12'; else echo 'GoodCity_2020_Development.p12'; fi)' >> $BASH_ENV - run: command: | npm rebuild node-sass diff --git a/Gemfile.lock b/Gemfile.lock index 523e8c27..97157261 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -143,7 +143,7 @@ GEM concurrent-ruby (~> 1.0) json (2.2.0) jwt (2.1.0) - memoist (0.16.0) + memoist (0.16.1) mime-types (3.3) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) diff --git a/Rakefile b/Rakefile index bc8992ab..099f246f 100755 --- a/Rakefile +++ b/Rakefile @@ -189,7 +189,7 @@ def mobile_provisioning_file file = if production_env? "GoodCityDonor.mobileprovision" else - "GoodCity_App_Staging.mobileprovision" + "GoodCityAppStaging.mobileprovision" end File.join(prefix, file) end From ad7ead184523c1914e36e73a41eb1a8d2d97e46a Mon Sep 17 00:00:00 2001 From: namrataukirde Date: Wed, 13 Nov 2019 16:51:30 +0530 Subject: [PATCH 10/10] increase app version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06ec8ac0..1a13c1c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "goodcity", - "version": "0.17.1", + "version": "0.17.2", "description": "Small description for goodcity goes here", "license": "MIT", "author": "",