From ed0caa6c11b441f860400f1f762a8c3ffc1fab92 Mon Sep 17 00:00:00 2001 From: Apollos Admin Date: Tue, 12 Oct 2021 13:52:23 +0000 Subject: [PATCH 1/3] Release 2.35.0 --- apollos-church-api/apollos.json | 2 +- apollos-church-api/package.json | 36 ++-- apolloschurchapp/apollos.json | 2 +- apolloschurchapp/ios/Podfile.lock | 4 +- apolloschurchapp/package.json | 32 ++-- yarn.lock | 272 +++++++++++++++--------------- 6 files changed, 174 insertions(+), 174 deletions(-) diff --git a/apollos-church-api/apollos.json b/apollos-church-api/apollos.json index d066d2193..532e2a8fb 100644 --- a/apollos-church-api/apollos.json +++ b/apollos-church-api/apollos.json @@ -1,4 +1,4 @@ { - "version": "2.34.0", + "version": "2.35.0", "environment": "api" } diff --git a/apollos-church-api/package.json b/apollos-church-api/package.json index 6c2c6515a..0ad86a841 100644 --- a/apollos-church-api/package.json +++ b/apollos-church-api/package.json @@ -18,21 +18,21 @@ "node": ">=14" }, "dependencies": { - "@apollosproject/config": "^2.34.0", - "@apollosproject/data-connector-algolia-search": "^2.34.0", - "@apollosproject/data-connector-analytics": "^2.34.0", - "@apollosproject/data-connector-bible": "^2.34.0", - "@apollosproject/data-connector-church-online": "^2.34.0", - "@apollosproject/data-connector-cloudinary": "^2.34.0", - "@apollosproject/data-connector-onesignal": "^2.34.0", - "@apollosproject/data-connector-passes": "^2.34.0", - "@apollosproject/data-connector-postgres": "^2.34.0", - "@apollosproject/data-connector-redis-cache": "^2.34.0", - "@apollosproject/data-connector-rock": "^2.34.0", - "@apollosproject/data-connector-twilio": "^2.34.0", - "@apollosproject/data-schema": "^2.34.0", - "@apollosproject/rock-apollo-data-source": "^2.34.0", - "@apollosproject/server-core": "^2.34.0", + "@apollosproject/config": "^2.35.0", + "@apollosproject/data-connector-algolia-search": "^2.35.0", + "@apollosproject/data-connector-analytics": "^2.35.0", + "@apollosproject/data-connector-bible": "^2.35.0", + "@apollosproject/data-connector-church-online": "^2.35.0", + "@apollosproject/data-connector-cloudinary": "^2.35.0", + "@apollosproject/data-connector-onesignal": "^2.35.0", + "@apollosproject/data-connector-passes": "^2.35.0", + "@apollosproject/data-connector-postgres": "^2.35.0", + "@apollosproject/data-connector-redis-cache": "^2.35.0", + "@apollosproject/data-connector-rock": "^2.35.0", + "@apollosproject/data-connector-twilio": "^2.35.0", + "@apollosproject/data-schema": "^2.35.0", + "@apollosproject/rock-apollo-data-source": "^2.35.0", + "@apollosproject/server-core": "^2.35.0", "apollo-server": "^2.24.1", "apollo-server-express": "2.14.2", "color": "3.0.0", @@ -42,9 +42,9 @@ "randomcolor": "0.5.3" }, "devDependencies": { - "@apollosproject/apollo-server-env-mock": "^2.34.0", - "@apollosproject/babel-preset-apollos": "^2.34.0", - "@apollosproject/eslint-config": "^2.34.0", + "@apollosproject/apollo-server-env-mock": "^2.35.0", + "@apollosproject/babel-preset-apollos": "^2.35.0", + "@apollosproject/eslint-config": "^2.35.0", "@babel/cli": "^7.4.5", "@babel/core": "^7.4.5", "@babel/node": "^7.7.4", diff --git a/apolloschurchapp/apollos.json b/apolloschurchapp/apollos.json index ad7a07c3e..94703862a 100644 --- a/apolloschurchapp/apollos.json +++ b/apolloschurchapp/apollos.json @@ -1,4 +1,4 @@ { - "version": "2.34.0", + "version": "2.35.0", "environment": "client" } diff --git a/apolloschurchapp/ios/Podfile.lock b/apolloschurchapp/ios/Podfile.lock index 6e6e41c49..f64a668c0 100644 --- a/apolloschurchapp/ios/Podfile.lock +++ b/apolloschurchapp/ios/Podfile.lock @@ -241,7 +241,7 @@ PODS: - React-cxxreact (= 0.63.4) - React-jsi (= 0.63.4) - React-jsinspector (0.63.4) - - react-native-apollos-player (2.34.0): + - react-native-apollos-player (2.35.0): - React - react-native-config (0.11.7): - React @@ -631,7 +631,7 @@ SPEC CHECKSUMS: React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31 React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949 React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a - react-native-apollos-player: f503cf8f6d4a582f02d00909134ddc0fd9bed4a0 + react-native-apollos-player: af0449934fae6e2a84fbe2299692c8ecbefca01f react-native-config: 55548054279d92e0e4566ea15a8b9b81028ec342 react-native-geolocation: c956aeb136625c23e0dce0467664af2c437888c9 react-native-geolocation-service: f33626f1ae12381ca2ae60f98b2f5edd676bf95a diff --git a/apolloschurchapp/package.json b/apolloschurchapp/package.json index b87d84c67..3000c9691 100644 --- a/apolloschurchapp/package.json +++ b/apolloschurchapp/package.json @@ -44,22 +44,22 @@ "dependencies": { "@apollo/client": "3.3.20", "@apollo/react-hooks": "^3.1.3", - "@apollosproject/config": "^2.34.0", + "@apollosproject/config": "^2.35.0", "@apollosproject/react-native-airplay-btn": "^0.2.0", - "@apollosproject/ui-analytics": "^2.34.0", - "@apollosproject/ui-auth": "^2.34.0", - "@apollosproject/ui-connected": "^2.34.0", - "@apollosproject/ui-fragments": "^2.34.0", - "@apollosproject/ui-htmlview": "^2.34.0", - "@apollosproject/ui-kit": "^2.34.0", - "@apollosproject/ui-mapview": "^2.34.0", - "@apollosproject/ui-media-player": "^2.34.0", - "@apollosproject/ui-notifications": "^2.34.0", - "@apollosproject/ui-onboarding": "^2.34.0", - "@apollosproject/ui-passes": "^2.34.0", - "@apollosproject/ui-prayer": "^2.34.0", - "@apollosproject/ui-scripture": "^2.34.0", - "@apollosproject/ui-test-utils": "^2.34.0", + "@apollosproject/ui-analytics": "^2.35.0", + "@apollosproject/ui-auth": "^2.35.0", + "@apollosproject/ui-connected": "^2.35.0", + "@apollosproject/ui-fragments": "^2.35.0", + "@apollosproject/ui-htmlview": "^2.35.0", + "@apollosproject/ui-kit": "^2.35.0", + "@apollosproject/ui-mapview": "^2.35.0", + "@apollosproject/ui-media-player": "^2.35.0", + "@apollosproject/ui-notifications": "^2.35.0", + "@apollosproject/ui-onboarding": "^2.35.0", + "@apollosproject/ui-passes": "^2.35.0", + "@apollosproject/ui-prayer": "^2.35.0", + "@apollosproject/ui-scripture": "^2.35.0", + "@apollosproject/ui-test-utils": "^2.35.0", "@gorhom/bottom-sheet": "3.4.1", "@react-native-community/async-storage": "^1.5.1", "@react-native-community/datetimepicker": "^3.0.0", @@ -116,7 +116,7 @@ "yup": "0.26.6" }, "devDependencies": { - "@apollosproject/eslint-config": "^2.34.0", + "@apollosproject/eslint-config": "^2.35.0", "@babel/core": "^7.8.4", "@babel/runtime": "^7.8.4", "@bam.tech/react-native-make": "^3.0.3", diff --git a/yarn.lock b/yarn.lock index 30b6ceab7..57ebe9f0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -142,15 +142,15 @@ http-errors "^1.7.3" object-path "^0.11.4" -"@apollosproject/apollo-server-env-mock@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/apollo-server-env-mock/-/apollo-server-env-mock-2.34.0.tgz#5babd99ed4309f9e2f704de0e9aadb3a0011be3e" - integrity sha512-B3K92/vr28epVUD3soA9BuVzNrXwwpmEIrPL6fRPp5pFeL1tSaLUqGGn9jZOEclm6rr3KZ4c/CYBMiuRENe0ZQ== +"@apollosproject/apollo-server-env-mock@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/apollo-server-env-mock/-/apollo-server-env-mock-2.35.0.tgz#f73d9472da55328264c23ecce34eec5478fd8f45" + integrity sha512-HJdGaHCW4ojJpqJyy13kQnu+70u9lW+zSTWXk4G7+1/IWAApUjwjrKEReBGxRGzviw/Lo6FOQ8yh3ZOCcQbMxg== -"@apollosproject/babel-preset-apollos@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/babel-preset-apollos/-/babel-preset-apollos-2.34.0.tgz#de208513462b32962e0e4869e318ac6bbfffc06a" - integrity sha512-It1c8PaYhvXlL3tPHJhdGLVTIirsj7tmz2LiOTITJEC2hD+81peVQjLcCp6ynaBR4zh69hqN+qodibK83uewvg== +"@apollosproject/babel-preset-apollos@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/babel-preset-apollos/-/babel-preset-apollos-2.35.0.tgz#3f2c5cc15031536f7b34ee4899341a3b2c96c629" + integrity sha512-pgNY8LaceZtUscQvu3ahZpNBsQ4dS6JdOByLw8Pb8Tqxm6e5lxz+f1+9haMZA6k0hi0nVUEw4McbBwl1SgDTkw== dependencies: "@babel/plugin-proposal-class-properties" "7.4.0" "@babel/plugin-proposal-decorators" "7.4.0" @@ -172,83 +172,83 @@ "@babel/preset-env" "7.4.2" babel-plugin-module-resolver "^3.1.1" -"@apollosproject/config@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/config/-/config-2.34.0.tgz#3a77bc8d1c6054f4b851b2e14226c95b9ae84c54" - integrity sha512-4NR6nClml1k+bVQFholE0Xr880msnE6z6T0ZYTMef5Y4fJ5piodzUT5UmWByS+ZF5rEOwuywppDwFdBApUkkGA== +"@apollosproject/config@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/config/-/config-2.35.0.tgz#0e3df0c77a7fc7ca7320c3151137f944607cdd8e" + integrity sha512-HzQWKCbmqRXEipLi0E17aZKdKc9traLpo393ErLeyp0H563nxYvDdTing/71fPvYTwIYiFO9GQ7wbce3zeT2bg== dependencies: js-yaml "^3.12.0" -"@apollosproject/data-connector-algolia-search@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-algolia-search/-/data-connector-algolia-search-2.34.0.tgz#e525cc70a159fe748a4991c3e20dcb8cfda6038d" - integrity sha512-aU27E95kQDGSPTl61+R3z8fD5EWUyjCdPG+rBeSme4DoFSZ8EuiwNAMEBdE1vDM1a0Q54BvRx7o/sdQFko/O8Q== +"@apollosproject/data-connector-algolia-search@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-algolia-search/-/data-connector-algolia-search-2.35.0.tgz#8ae985fc955628431b4a8c16c755a036adb1bef1" + integrity sha512-5JWko/m9ndXr8AYjBCV/5xTV5QcgmCrmH/S4Rr89SCDLULEJV6a0gMqhIlMtxSzILYuhZzJmNjd7K+P0lRCATw== dependencies: - "@apollosproject/server-core" "^2.34.0" + "@apollosproject/server-core" "^2.35.0" algoliasearch "^3.34.0" apollo-datasource-rest "^0.6.4" -"@apollosproject/data-connector-analytics@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-analytics/-/data-connector-analytics-2.34.0.tgz#2fda385e9b3c08d6c899014f75e2643f4abfecca" - integrity sha512-7GFN/8JrOQ6YeQTre1UFl41/qItriWKnKqkeQhfn4vbef77crJUWprMRMucdtqzimvvcqCZRwsy2TieWRgSCqw== +"@apollosproject/data-connector-analytics@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-analytics/-/data-connector-analytics-2.35.0.tgz#4bdb2797418b1810308f1b644d080d7596638087" + integrity sha512-lcxIahYwgbywxf+g/p/wOKVp7ofLij9ZXdjTKmpzs7U91wCeVVH6pEn8Mq0VsblmE+VAa/2fjtAJPUp73vQKuA== dependencies: analytics-node "^3.4.0-beta.1" apollo-datasource "^0.2.0" universal-analytics "^0.4.20" -"@apollosproject/data-connector-bible@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-bible/-/data-connector-bible-2.34.0.tgz#92ca59f52793494f2768cba06abeebb951a4ffd4" - integrity sha512-K+gbMdpQxxUKCQXOqN+dXbcTIggMpG0xccztFkuaUbnNQ29mkiOj7zgKnVHg+VIqJqdawJxVq2L+2rMh5CkOhg== +"@apollosproject/data-connector-bible@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-bible/-/data-connector-bible-2.35.0.tgz#1ad8612dbeb2673fa2621005d6b848716f875173" + integrity sha512-hWAL5PmVgrf3sZYX9KXE+TI6VJe9aa80jcRE25rgE+1ZeX/8/eoLqZtVSaYcInTuzIBCVP/r+QndpXpjb/dYcQ== dependencies: - "@apollosproject/server-core" "^2.34.0" + "@apollosproject/server-core" "^2.35.0" apollo-datasource-rest "^0.6.4" lodash "^4.17.11" -"@apollosproject/data-connector-church-online@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-church-online/-/data-connector-church-online-2.34.0.tgz#f06116557ceb8d159313081751cf82c58f03acfd" - integrity sha512-Fylbuhzg1DEhZP1sy1T1Q1dCtS+YYX/38arRe6bkjgNuHfgEuITFr/9nNx1t61q0IVlFMfk7ElD2etVfXziZpw== +"@apollosproject/data-connector-church-online@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-church-online/-/data-connector-church-online-2.35.0.tgz#7ec7584e34159976acb71df93994a605bb0eab89" + integrity sha512-s7YsKj8FmgdO/ndwZBPogd3aF+L57LdE2deh1hNK1eCS4fVEQVlRRGF8S2uNkdFhcFzAMhCnQTeTPnODv1CJdg== dependencies: - "@apollosproject/server-core" "^2.34.0" + "@apollosproject/server-core" "^2.35.0" apollo-datasource-rest "^0.6.4" -"@apollosproject/data-connector-cloudinary@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-cloudinary/-/data-connector-cloudinary-2.34.0.tgz#875a25d95c26182f233953952cf96e8bda782ba5" - integrity sha512-GWsJPalRR29wwQ5BkoGpiWvhIgxKAwlIBCnd9aHsxC/iPh+WRyoFx+3Udx0MulX5Fxln5WOfE6f/UiQBwMv+Yw== +"@apollosproject/data-connector-cloudinary@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-cloudinary/-/data-connector-cloudinary-2.35.0.tgz#caccd8eb0f1e788d4b748dfd42ca760a8c5de1c0" + integrity sha512-c1NdIOyTPhcLXUjKRQRVDgAoiMSF1NnV/YB7ckyoTFabzhFUYD6SFluCRDhycbTiNiA/YZmlTI6vgQQtBO8ZvA== dependencies: cloudinary "1.14.0" -"@apollosproject/data-connector-onesignal@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-onesignal/-/data-connector-onesignal-2.34.0.tgz#c05e9b61ca2dbafee57fb514d7ae34cda46d70c8" - integrity sha512-sAQD2q1v4Vl4ENu5Z2v/NPfC76P72wu23xOcyyz52ev0Hkb55n8zspGnLEMrdg4HS3IWdrjagDozNFVUwB4Yyg== +"@apollosproject/data-connector-onesignal@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-onesignal/-/data-connector-onesignal-2.35.0.tgz#bca93d368bbc0e8e199cea1f475a01af086da7f4" + integrity sha512-Q6/8/gbzMJ5iXTPq73p42zWpimmb/ZCJc0R7p3+g2NnXlZhnDDMsYw4sDteKl7/urVWmOhrFbrwM/Afjp3bV2w== dependencies: - "@apollosproject/server-core" "^2.34.0" + "@apollosproject/server-core" "^2.35.0" apollo-datasource-rest "^0.6.4" -"@apollosproject/data-connector-passes@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-passes/-/data-connector-passes-2.34.0.tgz#4899f29ac562407b3e3f37fe7b9b635227bc305b" - integrity sha512-2G44HTy0Wy4jqyUyyD11KO8uPYA1uYG/CBbbB4HzlY82skiKzdP4m9v6KONpM+mKIwkWzh6NguryKSBp1OeUvw== +"@apollosproject/data-connector-passes@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-passes/-/data-connector-passes-2.35.0.tgz#4b4da324d95a2be782d8728b05c4b3a5a1db1675" + integrity sha512-PTLLMfhNB1+poOzRncDQIxuJWRIlk/fFF9fcWwY6OUz+dhMp39uBUrR83v9zeRnpAt9NwvlS99QQ6FaRI6rwWg== dependencies: "@apollo/client" "3.3.20" - "@apollosproject/server-core" "^2.34.0" + "@apollosproject/server-core" "^2.35.0" apollo-datasource "^0.4.0" datauri "^1.1.0" lodash "^4.17.11" passkit-generator "1.5.9" qrcode "^1.3.3" -"@apollosproject/data-connector-postgres@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-postgres/-/data-connector-postgres-2.34.0.tgz#aba55f68e5872ad873494a09b14a8951f6db5290" - integrity sha512-M24mzDiWZt9G4CTjFV998ADoe/WThYeA4OEwPKYlDGV3KpsNqGpe9wJTmyfZsGbwnXxKcFhZWQNI2OhnXv2RuQ== +"@apollosproject/data-connector-postgres@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-postgres/-/data-connector-postgres-2.35.0.tgz#48a9ce2a7a5eac964a906686aae7e5d0e9196e87" + integrity sha512-7Jto8Zpg+dd+pFmjLZbSY+wfKWboeh7mLpII5OGrnLgjO4Jl7WwdhCnwb1SfZ+DGASdrDgoCiTkjgxc1Y06mog== dependencies: - "@apollosproject/data-schema" "^2.34.0" - "@apollosproject/server-core" "^2.34.0" + "@apollosproject/data-schema" "^2.35.0" + "@apollosproject/server-core" "^2.35.0" hyphenation.en-us "^0.2.1" hypher "^0.2.5" lodash "^4.17.11" @@ -257,18 +257,18 @@ sequelize "^6.3.5" umzug "^3.0.0-beta.15" -"@apollosproject/data-connector-redis-cache@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-redis-cache/-/data-connector-redis-cache-2.34.0.tgz#9bd6d1cd704374de20d1cc8c7b19668ac234e733" - integrity sha512-3Rl5fFy+5CKgk9N2AciQGQgv5PNcLC8q94o3pE9OhqHgybp3il0fIaDMs5UvJnRPzzYnLlGyoCEcMhWlvVZhgA== +"@apollosproject/data-connector-redis-cache@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-redis-cache/-/data-connector-redis-cache-2.35.0.tgz#e143f82869cf2db80c959792c67fac0e2ed9b087" + integrity sha512-KaPEMZ1poL1jmvQLlYnuon3BnIQd5BS15j5J9dM+obeP9Zrwgt3f1dafrpon9TWbzjtoapFWSkg4kF4SJo7dTA== dependencies: apollo-datasource "^0.2.0" ioredis "4.14.1" -"@apollosproject/data-connector-rock@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-rock/-/data-connector-rock-2.34.0.tgz#2dce23a008173b966e4679ddf36368335a7155e7" - integrity sha512-BIkFtRBGEt55BXFWH9K2oSmNKx5tnNB0pe7GsxSlwPB3d8YJjB9Ai7LFrZEJZz0f55+sLnjlfKPw5B9OfWu3Kg== +"@apollosproject/data-connector-rock@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-rock/-/data-connector-rock-2.35.0.tgz#8c1a43f861a55e4f9705f2d027865c432757f419" + integrity sha512-zBoLlENnFB+u4SvemaZqZnmcX+wBVpqfSvLxB1zMgH9M68us60VDtrszJaSuXYy+nA1bWRDOZjdk1ZBNzhrcHQ== dependencies: awesome-phonenumber "^2.4.2" form-data "^4.0.0" @@ -282,48 +282,48 @@ natural "^0.6.2" sanitize-html "^2.3.2" -"@apollosproject/data-connector-twilio@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-twilio/-/data-connector-twilio-2.34.0.tgz#47ebde7832eb8735a221502a7bbf96b63420eb6d" - integrity sha512-tKfyI1xRcM2Pp3oMeS5RHGIMJXBColYHS8eA9ZPKpZcTR9wVNqtuUF1/ZMNsozLjmgwrNfz78aH00l9fbUhIow== +"@apollosproject/data-connector-twilio@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-connector-twilio/-/data-connector-twilio-2.35.0.tgz#95c0d74485f83cb6897bc3ae2148af8cb98585e7" + integrity sha512-xCuE/VLBGcsHThCy2eIMdlvHQJt1yPogHmTBGyaEPBeUs+ytlenOkJ6uNkJsGbVqgyf1nSzbkhNIhHAfPMwCcg== dependencies: apollo-datasource "^0.2.0" twilio "^3.28.0" -"@apollosproject/data-schema@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/data-schema/-/data-schema-2.34.0.tgz#b52b78a59e1f756114871bbc330a67fc89372e20" - integrity sha512-BgKaEhrAAagn1yWNpJ7o+t8BgSAPJkxkCL3RaqWBRMGe3vl1Td5zp8gfX79SWILWH4TlGQxwMh19X9237cM0rQ== +"@apollosproject/data-schema@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/data-schema/-/data-schema-2.35.0.tgz#5962c0d109d79b81cfc0deb44d2fd6629c7a9b1d" + integrity sha512-JK/tLaDKVJxwODvy+1rqvSUNxIe1eqt8tt8vZFO3wANYLuTpWVtrwyf0VJ7Xg/mssp1xTi57SWc2se7o/Fe9ew== dependencies: "@apollo/client" "3.3.20" -"@apollosproject/eslint-config@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/eslint-config/-/eslint-config-2.34.0.tgz#6095f65054774041d9306e6b7bfb4f3c747189fb" - integrity sha512-qZto8z1vRu/xYKwEuPAj7EI0pTkyaPFv005idTdaUV6xtn2jPl3p5A+TKYO5eSlEAYSkMcEWQ0k6ebsrCv7PGQ== +"@apollosproject/eslint-config@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/eslint-config/-/eslint-config-2.35.0.tgz#de2f822d8c005482fa4b7e35e3842f437f549442" + integrity sha512-EINyUqaXNW+Gsfc1H+ACQngz8N7xDS1o25qE0Jduw52+DNdloUM+nmVS3EelIVFeD9mi2ARaOL+xEGdSn+i9ug== "@apollosproject/react-native-airplay-btn@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@apollosproject/react-native-airplay-btn/-/react-native-airplay-btn-0.2.0.tgz#19c1c7154e6c04fd4d5a5587faf6a69cb34d8a79" integrity sha512-yf5TRao2v+jq9LtzqAt4MBZ4OgYR01YsyfbU9TC8/D+M9TWkYTsU8uhWpwYyxN4K1dWBd9jagyDMU0fpcLhkPg== -"@apollosproject/rock-apollo-data-source@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/rock-apollo-data-source/-/rock-apollo-data-source-2.34.0.tgz#964e5e28d59ff2b52e6163fc2b35c579a99b3fc8" - integrity sha512-/lIcpait0a/eF349LDULg1bTW7RLik8bZW+Cb24dOvMoMNKvET+a1to7OT056bfg87c4yqh2EMoseclwrhm//w== +"@apollosproject/rock-apollo-data-source@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/rock-apollo-data-source/-/rock-apollo-data-source-2.35.0.tgz#493ccf3f6daf2ee8b6f42627a4f0b61dca5e4597" + integrity sha512-UPSkdhIFY5Xc1Vu1oZggSyRxqC9Xw7ZWfW+NVzYG/bm2cTBqFAfh7D3+XzMqI9Q6VbtGuDK3sIPJjRHJde4LOg== dependencies: apollo-datasource-rest "^0.6.4" apollo-server-env "^2.3.0" lodash "^4.17.11" with-query "^1.1.2" -"@apollosproject/server-core@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/server-core/-/server-core-2.34.0.tgz#1fa984aae1e9c4489b51deaf0175211d8dd08b60" - integrity sha512-CdaOv7sE0ZgFHY0XguBTm9Lw01Uufq039D4MBwJRE/I89A0A/Y465xxCdZeQgBBb2m+dd44a2/ls0sa3FBlw/g== +"@apollosproject/server-core@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/server-core/-/server-core-2.35.0.tgz#0c5574b62252aff600e242184d3e306c85199ae0" + integrity sha512-1X/04VL3FBE/zgFF64Hg7gc9zWKzX/KMfy+xGowN4mR7QuJyw2P1bg2qH8fyBafPZDQ0fTgdQSGaqmfAbKcYfA== dependencies: "@apollo/client" "3.3.20" - "@apollosproject/data-schema" "^2.34.0" + "@apollosproject/data-schema" "^2.35.0" apollo-server-caching "^0.4.0" bull "^3.11.0" bull-board "^0.1.1" @@ -332,50 +332,50 @@ graphql-upload "^12.0.0" lodash "^4.17.11" -"@apollosproject/ui-analytics@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-analytics/-/ui-analytics-2.34.0.tgz#823c22f43188abf00e31099a61d3592f0a69bea1" - integrity sha512-NhM7Qu6fPgcAQ8ftPb739Qaq7KO6YjM3HMhjmzF+g6Q3EIoSJdHK+3kbCTL+HJ38o8pJE2bm/eOFR2BEHKQJtQ== +"@apollosproject/ui-analytics@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-analytics/-/ui-analytics-2.35.0.tgz#3884b082296d04258a3ae115440b19e557c42c91" + integrity sha512-GnGxmQlz4GcpZW9xd/NTanud22yqgNfuBt28bETHdRVWJVmjQ96nv7+x/GzbbdzfZBdHTuYfB/PzzVt8AgWv3A== dependencies: react-native-device-info "^4.0.1" -"@apollosproject/ui-auth@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-auth/-/ui-auth-2.34.0.tgz#0de9843f010da1efaae0cb674dbe78165b092f3e" - integrity sha512-798H/1hfE6XZej1ycbdb4HJFc8zd8bwqtOIKVUtfk6e+DNm68yadiaXeMnzgNxXg6QK7tRo7Ehc9dHOUhryxhA== +"@apollosproject/ui-auth@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-auth/-/ui-auth-2.35.0.tgz#b5f83e52c8e065470e3ac876e89c567eef253ce4" + integrity sha512-l2bZcHCU449GQxzwAuGpGKTyPycfQEnJVa+hQccfDAyDdQwCfijrkdg2/rd4XfPVun9s6AaKrW73LwuRw5p0bw== dependencies: formik "1.5.1" yup "^0.27.0" -"@apollosproject/ui-connected@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-connected/-/ui-connected-2.34.0.tgz#b144e3f1ec6909f1023dbf001527f71531d9c07b" - integrity sha512-9yWGcqffcCcmXWDH+Avjda1+tt9m8MEzbIOBesCX1G7YK6E76yARP+S0jgdinUsWq+Tml+UWkRIqxU1Qd/xUPQ== +"@apollosproject/ui-connected@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-connected/-/ui-connected-2.35.0.tgz#0af96f1b1c295ab1b58c6fa61de4f83ed287e6f9" + integrity sha512-SsL7RFCOmtjLgwLHyd6Z5hjhBY1opGL3EW14jvSvfS3CbYrg2vQ+8gMyF0qjBUeglkOtcKnLrKU8uwjyxR6phw== dependencies: apollo-upload-client "14.1.3" graphql-tag "2.9.2" lodash "^4.17.11" moment "^2.29.1" -"@apollosproject/ui-fragments@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-fragments/-/ui-fragments-2.34.0.tgz#9a11131022223e7005509a2f444fba3d877b5265" - integrity sha512-SYZ71B5ccY6DpORwJRROU1E/MW1iyUzfpKN32VNSK++mzrA1pL2iWCbuXilMr9aet1uENs+htC4ow06NHap9Mg== +"@apollosproject/ui-fragments@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-fragments/-/ui-fragments-2.35.0.tgz#25b29daed340e504506e2c06a6ce195e6d06ae95" + integrity sha512-Zyl42qwr1H1YE931+3sPgFrMNIbz5InMACZ4JinDe+SY9F56YNEzE8KaiOnP24P9XEJkUxlqywMFkZQNtAEj3w== dependencies: "@apollo/client" "3.3.20" -"@apollosproject/ui-htmlview@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-htmlview/-/ui-htmlview-2.34.0.tgz#47e7ad8b8453be1eef2c77492eb8ce3c248dd54e" - integrity sha512-dVtEgf4UDL0RK0d3iGRMwkW2RLdHBgHQgx6I6yDStPtZDPYSZrTDW9CADCexd4WTm9AI0t0vrft+L+MifdNFoQ== +"@apollosproject/ui-htmlview@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-htmlview/-/ui-htmlview-2.35.0.tgz#55f24349f6fa93bf2d630ca4a410c35ae991cac3" + integrity sha512-+jgrkOkwwP9Tw8TEjf+Z/0HtfcIMeZTaFoP2WOaNAn2gPiI2z5FFHirEQQMmxrTdSCT6lQzCk+cm/mfft5gtBA== dependencies: entities "^1.1.2" htmlparser2 "3.9.2" -"@apollosproject/ui-kit@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-kit/-/ui-kit-2.34.0.tgz#ee21f5af10a87eba60a89c3b5cc6a6ef7187fb64" - integrity sha512-JDaGbFPVJSqGmi3T6cJEPiWbxnU8ecRPqsBsv0pvJQwqINNOCM20pXkY1a9YnBfKfsJ87o39/+oZo9HFTx6+tA== +"@apollosproject/ui-kit@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-kit/-/ui-kit-2.35.0.tgz#b8141a32fd33c70389ba784d4ed781835fe0d2ae" + integrity sha512-HfpXuBeyfZrMzHEpizxjuOjtVjvDGtZG5a6r/peTPntPTcvBIZyJnpZDeZ1IkAv7QkEUvlDa2QZgVp+AjXKysw== dependencies: "@react-native-community/blur" "^3.6.0" color "^3.1.0" @@ -388,35 +388,35 @@ recompose "^0.30.0" rn-placeholder "1.2.0" -"@apollosproject/ui-mapview@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-mapview/-/ui-mapview-2.34.0.tgz#42a2a5d0299eee950c22fa866310a01f177abd07" - integrity sha512-Y25AIa/9D9JlJ2pjZrJ3VcFYWCR65bzfIRF00EoBacJ90gVM7F1h3XErYNzFy6D6K20zwF/wkzG/iU5hi5m1mg== +"@apollosproject/ui-mapview@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-mapview/-/ui-mapview-2.35.0.tgz#3045b122725aa497bef9a3cac17968c3523c9a16" + integrity sha512-YBiLNf0TrFtxkxvTaVb5anMv7O12BPytu5iZXVDKQznxOKDBhW7kIeFCPRM2ngfO4+fxGr/xt0yVnPBrfLK5cA== dependencies: "@apollo/client" "3.3.20" -"@apollosproject/ui-media-player@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-media-player/-/ui-media-player-2.34.0.tgz#f7158f35419f71cab11a0c4e39f0a143b49518de" - integrity sha512-BBRT3iklUo7Q+4MUSEWeoSFt5WDQammzxpAMiLNjoC3s+674jusZbM/BKKlZJ0vS8M6X9B0MfG86hQzrhdheYQ== +"@apollosproject/ui-media-player@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-media-player/-/ui-media-player-2.35.0.tgz#f0ffd8e7efee24c4e5e42437441124cd8b70c535" + integrity sha512-unDbfuqrV6rCmWzIk9yt8JgC3+Q7g1XFGSYb0Y5vPgdFd9GOlS5mrxmCz7ifdUgKFzQ1s9DOtkg3uOb0j7Wi8g== dependencies: "@types/color" "^3.0.1" color "^3.1.2" use-debounce "5.1.0" -"@apollosproject/ui-notifications@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-notifications/-/ui-notifications-2.34.0.tgz#274b10e6c9be371f5a0f469d47d6e41548376259" - integrity sha512-MyTVqFXOLguNFydyB4doj2aGZKeVNy9+59J71z+pYOI0k3izf3wa5q9VwIU9GN0J4Eb/96VpPQtcudUF71psbw== +"@apollosproject/ui-notifications@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-notifications/-/ui-notifications-2.35.0.tgz#8dce6fef758b36691cccc2ca128a7a16428e74b3" + integrity sha512-XrgPvps2yQ3CsjVwH+va1KMWa20gLRIczizE/PivJ0xOBHXkHSYLoTFSlnKB/joQPLyw9WPB0eHR2yDTxQ+4qQ== dependencies: lodash "^4.17.11" react-native-permissions "^2.0.5" url "^0.11.0" -"@apollosproject/ui-onboarding@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-onboarding/-/ui-onboarding-2.34.0.tgz#5f33161dd1c6e398c9e1bf10b4859844e1da495f" - integrity sha512-2fbpDs0q/vEG/vyjxUVIeyJa7F8ainjeinTRkULmRJ18k1EME7x7FCDSZ4wz89WwNqkCkUX3igf2OMlddw8yoQ== +"@apollosproject/ui-onboarding@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-onboarding/-/ui-onboarding-2.35.0.tgz#b84cd7b7daea37a6103e8d330674776acecdcef6" + integrity sha512-d6YU+X1xbB9GyAvcOax5dbl9SnwvZmH6zwTWIG30eYihsRYsEG/8pHyyL/Oj5EET5PcF31M1y+gthAvBEDO8bQ== dependencies: "@react-native-community/async-storage" "^1.5.1" formik "1.5.1" @@ -426,17 +426,17 @@ react-native-swiper "^1.5.14" yup "0.26.6" -"@apollosproject/ui-passes@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-passes/-/ui-passes-2.34.0.tgz#a31d39c817d7a5322a525c2c8fde1a07e6e23dc9" - integrity sha512-X8g64YcrIpjzABnNFsTD5+IqomafUaadW51LPkeCRw1UsUOnY5dgjjO95wrDer9UVYJlDjZYU3c2NzT7iBxAuA== +"@apollosproject/ui-passes@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-passes/-/ui-passes-2.35.0.tgz#e07fa707435f5e9e45eb8c2c5db08aadecad19dc" + integrity sha512-eX+71i7KkXZRNW8HiSPYGI6vYmfORuyhKl41QMa3YWiVZWW7YjIbVqTHtOXLPwMooWHe0XY4mVQsop62dI1ogg== dependencies: "@apollo/client" "3.3.20" -"@apollosproject/ui-prayer@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-prayer/-/ui-prayer-2.34.0.tgz#cfafdace5357df5a54dfeb5fdeed304577fb431c" - integrity sha512-ZxZlGOQwglUpT9O/Y0cWZ3d9FmtHGgyPRq59vmHi2ut+4Mczi23ZwB/Bcaf8arNyBQ+Ya7vjrVJ+rGvejdi7mw== +"@apollosproject/ui-prayer@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-prayer/-/ui-prayer-2.35.0.tgz#80328446f11eed4c9552416314356ebe60f59217" + integrity sha512-+IINV8f2MrAKJWR3+Qv0ISVtxYS6EYVsZ4O1NVwiZ68IGD4jf1UtbCbkRtRkIPdaSLyUXQpwWIUjZFsW2D15Ww== dependencies: formik "1.5.1" lodash "4.17.21" @@ -444,15 +444,15 @@ react-native-swiper "^1.6.0" yup "0.26.6" -"@apollosproject/ui-scripture@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-scripture/-/ui-scripture-2.34.0.tgz#021fecfb0c324a55ec78104e98365d0d34d74050" - integrity sha512-5dtTGZGW92Dpj1WaKZVxjO/WHS3LSLwUXuPCUvbPQNDAOhcwf9Yl8z/UQocKPNJmoXnA5ZEhCw22FhlaTjRXlA== +"@apollosproject/ui-scripture@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-scripture/-/ui-scripture-2.35.0.tgz#b4ccba5d6854fdb6df64cf4d3771aeb1db4bbf4a" + integrity sha512-CoPKt4lVoBk4P9XZw4ZIc6ahEYdYaFdtTg1Faug+hy6p8zoKuSaiSp2HwC4CV99N+wy29lXtYXbU67lcHrdBsQ== -"@apollosproject/ui-test-utils@^2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@apollosproject/ui-test-utils/-/ui-test-utils-2.34.0.tgz#34d59ad70a486bf27a3e1316bd7ad62c5991d4d3" - integrity sha512-Kr1S2QYb05W+EZH/55++UA96Wfs/m3yJsw7LFH8/JAJJmq/ZyaBoRmvK+1x71U733j5W2+q8LxztUcGurG2cAQ== +"@apollosproject/ui-test-utils@^2.35.0": + version "2.35.0" + resolved "https://registry.yarnpkg.com/@apollosproject/ui-test-utils/-/ui-test-utils-2.35.0.tgz#34c5bc9f865ad38b2349d000acbd97578c029d64" + integrity sha512-0mKLdlzcsLl7eLxuEavumrNNdMwXCewLy3MzlEtl9zgyXTCfzPp7YBUjRNdEOdoRRFaxciuxY+fKt4XPY/fGAQ== "@babel/cli@^7.4.5": version "7.12.1" From 64a8f73b2af46a5c3865e237b7944aed7e36600e Mon Sep 17 00:00:00 2001 From: Michael Neeley Date: Wed, 13 Oct 2021 12:04:44 -0400 Subject: [PATCH 2/3] turns off automatic release (#496) this lets us upload screenshots and metadata from the terminal at first on new apps and then can flip that bit once we feel good about releaes --- apolloschurchapp/fastlane/Fastfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apolloschurchapp/fastlane/Fastfile b/apolloschurchapp/fastlane/Fastfile index d1c5e1c0c..00636db28 100644 --- a/apolloschurchapp/fastlane/Fastfile +++ b/apolloschurchapp/fastlane/Fastfile @@ -63,10 +63,10 @@ platform :ios do app_store_connect_api_key(key_filepath: "ios/apollos.p8", in_house: false) deliver( skip_binary_upload: true, - skip_screenshots: true, - skip_metadata: true, + skip_screenshots: false, + skip_metadata: false, submit_for_review: true, - automatic_release: true, + automatic_release: false, submission_information: { add_id_info_uses_idfa: false }, From 3d6527244f4d8c8d4133d3b8894125e77751e470 Mon Sep 17 00:00:00 2001 From: Michael Neeley Date: Thu, 21 Oct 2021 16:03:13 -0400 Subject: [PATCH 3/3] cleaned up tabs components (#495) * cleaned up tabs components this also makes the avatar small * linter fix --- apolloschurchapp/src/tabs/index.js | 76 ++++++++++-------------------- 1 file changed, 26 insertions(+), 50 deletions(-) diff --git a/apolloschurchapp/src/tabs/index.js b/apolloschurchapp/src/tabs/index.js index 686303360..60567f189 100644 --- a/apolloschurchapp/src/tabs/index.js +++ b/apolloschurchapp/src/tabs/index.js @@ -1,5 +1,4 @@ import React, { useEffect } from 'react'; -import PropTypes from 'prop-types'; import { Image, View } from 'react-native'; import { useNavigation } from '@react-navigation/native'; import { createNativeStackNavigator } from 'react-native-screens/native-stack'; @@ -7,6 +6,7 @@ import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; import { NavigationService, withTheme, + useTheme, Icon, Touchable, } from '@apollosproject/ui-kit'; @@ -33,60 +33,36 @@ const HeaderLogo = withTheme(({ theme }) => ({ : require('./wordmark.dark.png'), }))(Image); -const SearchIcon = withTheme(({ theme: { colors, sizing: { baseUnit } } }) => ({ - name: 'search', - size: baseUnit * 2, - fill: colors.primary, -}))(Icon); - -const SearchButton = ({ onPress }) => ( - - - -); - -SearchButton.propTypes = { - onPress: PropTypes.func, -}; - -const Avatar = withTheme(({ theme: { sizing: { baseUnit } } }) => ({ - size: 'xsmall', - containerStyle: { - paddingBottom: baseUnit * 0.25, - }, -}))(UserAvatarConnected); - -const ProfileButton = ({ onPress }) => ( - - - - - -); - -ProfileButton.propTypes = { - onPress: PropTypes.func, -}; - -const HeaderLeft = () => { +const ProfileButton = () => { const navigation = useNavigation(); return ( - { navigation.navigate('UserSettingsNavigator'); }} - /> + > + + + + ); }; -const HeaderCenter = () => ; -const HeaderRight = () => { + +const SearchButton = () => { const navigation = useNavigation(); + const theme = useTheme(); return ( - { navigation.navigate('Search'); }} - /> + > + + ); }; @@ -94,9 +70,9 @@ const HeaderRight = () => { const HomeTab = createFeatureFeedTab({ screenOptions: { headerHideShadow: true, - headerCenter: HeaderCenter, - headerRight: HeaderRight, - headerLeft: HeaderLeft, + headerCenter: HeaderLogo, + headerRight: SearchButton, + headerLeft: ProfileButton, headerLargeTitle: false, }, tabName: 'Home', @@ -105,7 +81,7 @@ const HomeTab = createFeatureFeedTab({ const ReadTab = createFeatureFeedTab({ options: { - headerLeft: HeaderLeft, + headerLeft: ProfileButton, }, tabName: 'Read', feedName: 'READ', @@ -113,7 +89,7 @@ const ReadTab = createFeatureFeedTab({ const WatchTab = createFeatureFeedTab({ options: { - headerLeft: HeaderLeft, + headerLeft: ProfileButton, }, tabName: 'Watch', feedName: 'WATCH', @@ -121,7 +97,7 @@ const WatchTab = createFeatureFeedTab({ const PrayTab = createFeatureFeedTab({ options: { - headerLeft: HeaderLeft, + headerLeft: ProfileButton, }, tabName: 'Pray', feedName: 'PRAY', @@ -143,7 +119,7 @@ const ConnectTabStackNavigator = () => ( name={'Connect'} component={CustomConnectScreen} options={{ - headerLeft: HeaderLeft, + headerLeft: ProfileButton, }} />