From 29a37f28a12c241f4c3efbd4f84578e193931ac9 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 24 Jun 2020 12:41:40 +0300 Subject: [PATCH 1/2] Add missing files --- additional/package.json | 5 +++++ bootstrap.sh | 6 ++++++ templates/gitignore | 7 +++++++ templates/project.mustache | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 additional/package.json diff --git a/additional/package.json b/additional/package.json new file mode 100644 index 0000000..ced16cd --- /dev/null +++ b/additional/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "firebase-tools": "^7.12.1" + } +} diff --git a/bootstrap.sh b/bootstrap.sh index 29c094b..18aee87 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -127,11 +127,17 @@ brew bundle bundle exec fastlane add_plugin firebase_app_distribution bundle exec fastlane add_plugin badge +#yarn +yarn install + # copy setup, install and update commands cp $CURRENT_DIR/additional/setup.command setup.command cp $CURRENT_DIR/additional/install_dependencies.command install_dependencies.command cp $CURRENT_DIR/additional/update_dependencies.command update_dependencies.command +#copy package for firebase +cp $CURRENT_DIR/additional/package.json package.json + # commit git checkout -b feature/setup_project git add . diff --git a/templates/gitignore b/templates/gitignore index 9f475dd..9f06141 100755 --- a/templates/gitignore +++ b/templates/gitignore @@ -2,6 +2,9 @@ # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore +## OS X temporary files +.DS_Store + ## Build generated build/ DerivedData/ @@ -66,6 +69,10 @@ fastlane/Preview.html fastlane/screenshots fastlane/test_output +# Node.js +# Dependency directories +node_modules/ + # Touch Instinct custom Downloads/ fastlane/README.md diff --git a/templates/project.mustache b/templates/project.mustache index cf7eec1..029a16b 100644 --- a/templates/project.mustache +++ b/templates/project.mustache @@ -32,7 +32,7 @@ targets: prebuildScripts: - script: ". build-scripts/xcode/build_phases/localization.sh" name: Localization - - script: ". build-scripts/xcode/build_phases/api_generator.sh 1.1.35" + - script: ". build-scripts/xcode/build_phases/api_generator.sh 1.4.0-alpha1" name: API Generator postbuildScripts: - script: ". build-scripts/xcode/build_phases/swiftlint.sh" From 1d8643bfe6b1410e2f3f5f6512466e92f29175c5 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 24 Jun 2020 13:48:41 +0300 Subject: [PATCH 2/2] Update bootstrap --- bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 18aee87..64257e2 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -127,6 +127,9 @@ brew bundle bundle exec fastlane add_plugin firebase_app_distribution bundle exec fastlane add_plugin badge +#copy package for firebase +cp $CURRENT_DIR/additional/package.json package.json + #yarn yarn install @@ -135,9 +138,6 @@ cp $CURRENT_DIR/additional/setup.command setup.command cp $CURRENT_DIR/additional/install_dependencies.command install_dependencies.command cp $CURRENT_DIR/additional/update_dependencies.command update_dependencies.command -#copy package for firebase -cp $CURRENT_DIR/additional/package.json package.json - # commit git checkout -b feature/setup_project git add .