update crashlytics qs test with new dir

.github/workflows/crashlytics.yml

@@ -81,6 +81,8 @@ jobs:
     - uses: actions/checkout@v2
     - name: Setup quickstart
       run: scripts/setup_quickstart.sh crashlytics
+      env:
+        LEGACY: true
     - name: Install Secret GoogleService-Info.plist
       run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-crashlytics.plist.gpg \
           quickstart-ios/crashlytics/GoogleService-Info.plist "$plist_secret"
@@ -89,13 +91,17 @@ jobs:
           quickstart-ios/TestUtils/FIREGSignInInfo.h "$signin_secret"
     - name: Test objc quickstart
       run: |
-        mkdir quickstart-ios/crashlytics/Pods/FirebaseCrashlytics
+        mkdir quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics
         # Set the deployed pod location of run and upload-symbols with the development pod version.
-        cp Crashlytics/run quickstart-ios/crashlytics/Pods/FirebaseCrashlytics/
-        cp Crashlytics/upload-symbols quickstart-ios/crashlytics/Pods/FirebaseCrashlytics/
+        cp Crashlytics/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
+        cp Crashlytics/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
         ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Crashlytics)
+      env:
+        LEGACY: true
     - name: Test swift quickstart
       run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Crashlytics swift)
+      env:
+        LEGACY: true
 
   crashlytics-cron-only:
     # Don't run on private repo.

scripts/setup_quickstart.sh

@@ -30,6 +30,12 @@ SAMPLE=$1
 
 RELEASE_TESTING=${2-}
 
+WORKSPACE_DIR="quickstart-ios/${SAMPLE}"
+
+if [[ ! -z "${LEGACY:-}" ]]; then
+  WORKSPACE_DIR="quickstart-ios/${SAMPLE}/Legacy${SAMPLE}Quickstart"
+fi
+
 # Installations is the only quickstart that doesn't need a real
 # GoogleService-Info.plist for its tests.
 if check_secrets || [[ ${SAMPLE} == "installations" ]]; then
@@ -39,7 +45,7 @@ if check_secrets || [[ ${SAMPLE} == "installations" ]]; then
   export FIREBASE_POD_REPO_FOR_DEV_POD=`pwd`
 
   git clone https://github.com/firebase/quickstart-ios.git
-  $scripts_dir/localize_podfile.swift quickstart-ios/"$SAMPLE"/Podfile "$RELEASE_TESTING"
+  $scripts_dir/localize_podfile.swift "$WORKSPACE_DIR"/Podfile "$RELEASE_TESTING"
   if [ "$RELEASE_TESTING" == "nightly_release_testing" ]; then
     set +x
     sed -i "" '1i\'$'\n'"source 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsTesting.git'"$'\n' quickstart-ios/"$SAMPLE"/Podfile
@@ -52,7 +58,7 @@ if check_secrets || [[ ${SAMPLE} == "installations" ]]; then
     set -x
     echo "Source of Podfile for prerelease testing is updated."
   fi
-  cd quickstart-ios/"$SAMPLE"
+  cd "${WORKSPACE_DIR}"
 
   # To test a branch, uncomment the following line
   # git checkout {BRANCH_NAME}
@@ -65,7 +71,11 @@ if check_secrets || [[ ${SAMPLE} == "installations" ]]; then
     bundle exec pod install
   fi
 
+  if [[ ! -z "${LEGACY:-}" ]]; then
+    cd ..
+  fi
+
   # Add GoogleService-Info.plist to Xcode project
-  ruby ../scripts/info_script.rb "${SAMPLE}"
+  ruby ../scripts/info_script.rb "${SAMPLE}" "${LEGACY:-}"
   cd -
 fi

scripts/test_quickstart.sh

@@ -27,7 +27,7 @@ source scripts/check_secrets.sh
 if check_secrets; then
   cd quickstart-ios
   if [ "$platform" = "swift" ]; then
-    have_secrets=true SAMPLE="$sample" SWIFT_SUFFIX="Swift" SWIFT_DEFINES=-DFIREBASE7 ./scripts/test.sh
+    have_secrets=true SAMPLE="$sample" SWIFT_SUFFIX="Swift" ./scripts/test.sh
   else
     have_secrets=true SAMPLE="$sample" ./scripts/test.sh
   fi