From 5e928a08e21fbc6afd4d85fc5cc66c2fd739dd76 Mon Sep 17 00:00:00 2001 From: Dmitry Nesterenok Date: Tue, 28 Oct 2025 13:14:43 +0400 Subject: [PATCH 1/3] Use develop branch for flutter_lib --- setup-dartwing-project.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup-dartwing-project.sh b/setup-dartwing-project.sh index 2ee8efe..45aa006 100755 --- a/setup-dartwing-project.sh +++ b/setup-dartwing-project.sh @@ -115,7 +115,7 @@ echo "" # Clone or update repositories clone_or_update_repo "Flutter App" "$APP_REPO" "app" "$BRANCH" clone_or_update_repo "Gatekeeper Service" "$GATEKEEPER_REPO" "gatekeeper" "$BRANCH" -clone_or_update_repo "Flutter Library" "$LIB_REPO" "lib" "$BRANCH" +clone_or_update_repo "Flutter Library" "$LIB_REPO" "lib" "develop" echo "" print_status "All repositories cloned/updated successfully!" @@ -153,4 +153,4 @@ echo "2. Check the app/ directory for the Flutter application" echo "3. Check the gatekeeper/ directory for the backend service" echo "4. Check the lib/ directory for shared Flutter components" echo "" -echo "To update all components in the future, run this script again." \ No newline at end of file +echo "To update all components in the future, run this script again." From 76bbbe2e3c9c4e08e116e1d7f299308c438a4114 Mon Sep 17 00:00:00 2001 From: Dmitry Nesterenok Date: Tue, 28 Oct 2025 13:39:19 +0400 Subject: [PATCH 2/3] Use develop branch when we don't pass branch --- setup-dartwing-project.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup-dartwing-project.sh b/setup-dartwing-project.sh index 45aa006..5d7579e 100755 --- a/setup-dartwing-project.sh +++ b/setup-dartwing-project.sh @@ -43,7 +43,7 @@ clone_or_update_repo() { local repo_name=$1 local repo_url=$2 local target_dir=$3 - local branch=${4:-$DEFAULT_BRANCH} + local branch=${4:-develop} if [ -d "$target_dir" ]; then if [ -d "$target_dir/.git" ]; then @@ -115,7 +115,11 @@ echo "" # Clone or update repositories clone_or_update_repo "Flutter App" "$APP_REPO" "app" "$BRANCH" clone_or_update_repo "Gatekeeper Service" "$GATEKEEPER_REPO" "gatekeeper" "$BRANCH" +<<<<<<< Updated upstream clone_or_update_repo "Flutter Library" "$LIB_REPO" "lib" "develop" +======= +clone_or_update_repo "Flutter Library" "$LIB_REPO" "lib" +>>>>>>> Stashed changes echo "" print_status "All repositories cloned/updated successfully!" From 77334171ce5f4dabae88a73f3a37dc7161f2ff8b Mon Sep 17 00:00:00 2001 From: Dmitry Nesterenok Date: Tue, 28 Oct 2025 13:42:06 +0400 Subject: [PATCH 3/3] merge --- setup-dartwing-project.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup-dartwing-project.sh b/setup-dartwing-project.sh index 5d7579e..b0218e6 100755 --- a/setup-dartwing-project.sh +++ b/setup-dartwing-project.sh @@ -115,12 +115,7 @@ echo "" # Clone or update repositories clone_or_update_repo "Flutter App" "$APP_REPO" "app" "$BRANCH" clone_or_update_repo "Gatekeeper Service" "$GATEKEEPER_REPO" "gatekeeper" "$BRANCH" -<<<<<<< Updated upstream -clone_or_update_repo "Flutter Library" "$LIB_REPO" "lib" "develop" -======= clone_or_update_repo "Flutter Library" "$LIB_REPO" "lib" ->>>>>>> Stashed changes - echo "" print_status "All repositories cloned/updated successfully!"