From 67412ca1513057f7f6e473f37ec9b89230642655 Mon Sep 17 00:00:00 2001 From: Daniel Rochetti Date: Thu, 14 May 2020 15:14:34 -0700 Subject: [PATCH] fix(tools): change the tools script to comply with amplify-app changes (#445) --- AmplifyTools/amplify-tools.sh | 7 +++++-- Podfile.lock | 2 +- Pods/Manifest.lock | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/AmplifyTools/amplify-tools.sh b/AmplifyTools/amplify-tools.sh index 2aeaba717d..b2e29471b1 100755 --- a/AmplifyTools/amplify-tools.sh +++ b/AmplifyTools/amplify-tools.sh @@ -11,11 +11,11 @@ export PATH=$PATH:$(npm bin -g) if ! which node >/dev/null; then echo "warning: Node is not installed. Vist https://nodejs.org/en/download/ to install it" exit 1 -elif ! test -f ./amplifyxc.config; then +elif ! test -f ./amplifytools.xcconfig; then npx amplify-app --platform ios fi -. amplifyxc.config +. amplifytools.xcconfig amplifyPush=$push amplifyModelgen=$modelgen amplifyProfile=$profile @@ -25,7 +25,10 @@ amplifyRegion=$region amplifyEnvName=$envName if $amplifyModelgen; then + echo "modelgen is set to true, generating Swift models from schema.graphql..." amplify codegen model + # calls amplify-app again so the Xcode project is updated with the generated models + amplify-app --platform ios fi if [ -z "$amplifyAccessKey" ] || [ -z "$amplifySecretKey" ] || [ -z "$amplifyRegion" ]; then diff --git a/Podfile.lock b/Podfile.lock index ebcf5bbca6..b43541b0bb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -24,7 +24,7 @@ DEPENDENCIES: - SwiftLint SPEC REPOS: - trunk: + https://cdn.cocoapods.org/: - AWSAuthCore - AWSCognitoIdentityProvider - AWSCognitoIdentityProviderASF diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index ebcf5bbca6..b43541b0bb 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -24,7 +24,7 @@ DEPENDENCIES: - SwiftLint SPEC REPOS: - trunk: + https://cdn.cocoapods.org/: - AWSAuthCore - AWSCognitoIdentityProvider - AWSCognitoIdentityProviderASF