From cd6f56a3fcf3db20dbb2531a58abfd5bfbe1c0be Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 23 Jun 2021 15:41:59 -0400
Subject: [PATCH 01/25] fat library build

---
 MVMCore/MVMCore.xcodeproj/project.pbxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj
index 49f3911..e5d91e7 100644
--- a/MVMCore/MVMCore.xcodeproj/project.pbxproj
+++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj
@@ -818,7 +818,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "unset TOOLCHAINS #Xcode 7.3 BUG FIX  http://stackoverflow.com/questions/36184930/xcodebuild-7-3-cant-enable-bitcode\n\n# define output folder environment variable\nC_PROJECT_NAME=\"MVMCore\"\n\nUNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal\n\n# Step 1. Build Device and Simulator versions\nxcodebuild -target \"${C_PROJECT_NAME}\" ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\"\n\nxcodebuild -target \"${C_PROJECT_NAME}\" ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphonesimulator -arch i386 -arch x86_64 BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\"\n\nmkdir -p \"${UNIVERSAL_OUTPUTFOLDER}\"\n\nrm -rf ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework\ncp -R ${BUILD_DIR}/${CONFIGURATION}-iphoneos/${C_PROJECT_NAME}.framework ${UNIVERSAL_OUTPUTFOLDER}\n\n# Step 2. Create universal binary file using lipo\n\nlipo -create -output \"${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}\" \"${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/${C_PROJECT_NAME}\" \"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${C_PROJECT_NAME}.framework/${C_PROJECT_NAME}\"\n\nmv ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME} ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/${C_PROJECT_NAME}";
+			shellScript = "unset TOOLCHAINS #Xcode 7.3 BUG FIX  http://stackoverflow.com/questions/36184930/xcodebuild-7-3-cant-enable-bitcode\n\n# define output folder environment variable\nC_PROJECT_NAME=\"MVMCore\"\nPHONE_CONFIGURATION=\"Release\"\nSIMULATOR_CONFIGURATION=\"Debug\"\n\nUNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/universal\n\n# Step 1. Build Device and Simulator versions\nxcodebuild -scheme \"${C_PROJECT_NAME}\" ONLY_ACTIVE_ARCH=NO -configuration ${PHONE_CONFIGURATION} -sdk iphoneos -archivePath \"${BUILD_DIR}/${PHONE_CONFIGURATION}-iphoneos/${C_PROJECT_NAME}\" archive SKIP_INSTALL=false\n\nxcodebuild -target \"${C_PROJECT_NAME}\" ONLY_ACTIVE_ARCH=NO -configuration ${SIMULATOR_CONFIGURATION} -sdk iphonesimulator -arch x86_64 BUILD_DIR=\"${BUILD_DIR}\"\n\nmkdir -p \"${UNIVERSAL_OUTPUTFOLDER}\"\n\nrm -rf ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework\ncp -R ${BUILD_DIR}/${PHONE_CONFIGURATION}-iphoneos/\"${C_PROJECT_NAME}\".xcarchive/Products/Library/Frameworks/${C_PROJECT_NAME}.framework ${UNIVERSAL_OUTPUTFOLDER}\n\n# Step 2. Create universal binary file using lipo\n\nlipo -create -output \"${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}\" \"${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/${C_PROJECT_NAME}\" \"${BUILD_DIR}/${SIMULATOR_CONFIGURATION}-iphonesimulator/${C_PROJECT_NAME}.framework/${C_PROJECT_NAME}\"\n\nmv ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME} ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/${C_PROJECT_NAME}\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

From 0812eba421d864b81c7fc3df752e706d79cb92e8 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 12:49:15 -0400
Subject: [PATCH 02/25] add git ci file

---
 .gitlab-ci.yml | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..13f0557
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,92 @@
+stages:
+    - test
+
+test:
+  stage: test
+  script:
+    - echo "This job tests something"
+#stages:
+#  #  - test
+#  - build # generate the remote view framework
+#  - deploy # deploy the framework to Artifactory as a snapshot
+#  - tag # on manual confirmation, tag the repository
+#  - go live # move the snapshot binary on artifactory into live status
+#
+##run_unit_tests:
+##  stage: test
+##  script:
+##    - xcodebuild test -project ProjectName.xcodeproj -scheme SchemeName -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.2' | xcpretty -s
+##  tags:
+##    - xcode_12
+#
+#build_project:
+#  stage: build
+#  script:
+#    - xcodebuild build -workspace RemoteView.xcworkspace -scheme RemoteViewAggregate | xcpretty
+#  artifacts:
+#    paths:
+#      - RemoteViewFramework/**
+#    expire_in: 1 week
+#  only:
+#    - branches
+#    - develop
+#  tags:
+#    - xcode_12_2
+#  environment:
+#    name: oneartifactory
+#    url: https://oneartifactoryprod.verizon.com/artifactory
+#  variables:
+#    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
+#
+#deploy_snapshot:
+#  stage: deploy
+#  script:
+#    - cd Scripts && ./upload_remote_view_frameworks.sh
+#  only:
+#    - branches
+#    - develop
+#  tags:
+#    - bash_shell
+#  environment:
+#    name: oneartifactory
+#    url: https://oneartifactoryprod.verizon.com/artifactory
+#  variables:
+#    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
+#
+#promote_snapshot:
+#  stage: go live
+#  # Prevent artifacts from needing to re-download. Everything we need is in Artifactory.
+#  dependencies: []
+#  script:
+#    # Grab the framework version from the xcode project.
+#    - framework_ver=$(cd RemoteView && agvtool vers -terse)
+#    - cd Scripts && ./promote_remote_view_frameworks.sh $framework_ver
+#  only:
+#    - tags
+#  tags:
+#    - bash_shell
+#  environment:
+#    name: oneartifactory
+#    url: https://oneartifactoryprod.verizon.com/artifactory
+#  variables:
+#    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
+#
+#create_version_tag:
+#  stage: tag
+#  when: manual
+#  # Prevent artifacts from needing to re-download.
+#  dependencies: []
+#  script:
+#    # Grab the framework version from the xcode project and create a tag of the version.
+#    - framework_ver=$(cd RemoteView && agvtool vers -terse)
+#    - git tag -a "v${framework_ver}" -m "Version ${framework_ver} created by gitlab-ci Build"
+#    # Extract the git repo url to ssh version (git@gitlab.verizon.com)
+#    - ci_push_repo="git@${CI_SERVER_HOST}:${CI_PROJECT_PATH}.git"
+#    - echo $ci_push_repo
+#    # Set the remote url for pushing assuming the gitlab runner has SSH access to the repo.
+#    - git remote set-url --push origin $ci_push_repo
+#    - git push origin "v${framework_ver}"
+#  only:
+#    - develop
+#  tags:
+#    - bash_shell

From 04438d581b055f0e197d88eaf1bc8e970ef05f77 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 13:02:34 -0400
Subject: [PATCH 03/25] add git ci file

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13f0557..2aa2d55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,9 @@ test:
   stage: test
   script:
     - echo "This job tests something"
+  tags:
+    - xcode_12_2
+
 #stages:
 #  #  - test
 #  - build # generate the remote view framework

From bcd4b8f51da46a6b8ce40b32fa013300f17231d5 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 13:39:27 -0400
Subject: [PATCH 04/25] add git ci file

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2aa2d55..1f3230b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ test:
     - echo "This job tests something"
   tags:
     - xcode_12_2
-
+#
 #stages:
 #  #  - test
 #  - build # generate the remote view framework

From 3283e0fe9a02cf1d4da54225e6a725093ede7652 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 13:44:29 -0400
Subject: [PATCH 05/25] add git ci file

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f3230b..2aa2d55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ test:
     - echo "This job tests something"
   tags:
     - xcode_12_2
-#
+
 #stages:
 #  #  - test
 #  - build # generate the remote view framework

From cfab2674469b1fd7b5177834475d6918363bed58 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 14:09:22 -0400
Subject: [PATCH 06/25] add git ci file 1

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2aa2d55..1f3230b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ test:
     - echo "This job tests something"
   tags:
     - xcode_12_2
-
+#
 #stages:
 #  #  - test
 #  - build # generate the remote view framework

From 9dd5176c77b3b08b31eaf3ff6425bdff9c4ee2ab Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 14:35:56 -0400
Subject: [PATCH 07/25] build and upload

---
 .gitlab-ci.yml                           | 36 ++++++++++
 Scripts/upload_framework.sh              | 89 ++++++++++++++++++++++++
 Scripts/upload_remote_view_frameworks.sh | 26 +++++++
 3 files changed, 151 insertions(+)
 create mode 100644 Scripts/upload_framework.sh
 create mode 100644 Scripts/upload_remote_view_frameworks.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f3230b..6665929 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
 stages:
     - test
+    - build
+    - deploy
 
 test:
   stage: test
@@ -7,6 +9,40 @@ test:
     - echo "This job tests something"
   tags:
     - xcode_12_2
+    
+build_project:
+  stage: build
+  script:
+    - xcodebuild build -project MVMCore/MVMCore.xcodeproj -scheme FatLibrary | xcpretty
+  artifacts:
+    paths:
+      - RemoteViewFramework/**
+    expire_in: 1 week
+  only:
+    - branches
+    - feature/testing
+  tags:
+    - xcode_12_2
+  environment:
+    name: oneartifactory
+    url: https://oneartifactoryprod.verizon.com/artifactory
+  variables:
+    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
+
+deploy_snapshot:
+  stage: deploy
+  script:
+    - cd Scripts && ./upload_remote_view_frameworks.sh
+  only:
+    - branches
+    - feature/testing
+  tags:
+    - bash_shell
+  environment:
+    name: oneartifactory
+    url: https://oneartifactoryprod.verizon.com/artifactory
+  variables:
+    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
 #
 #stages:
 #  #  - test
diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh
new file mode 100644
index 0000000..c1e5990
--- /dev/null
+++ b/Scripts/upload_framework.sh
@@ -0,0 +1,89 @@
+#!/bin/bash -e
+
+#  upload_framework.sh
+#  RemoteView
+#
+#  Uploads an iOS framework to Artificatory given the local path as the first argument and the remote project name in Verizon OneArtifactory for the second argument.
+#
+#  An API key from Artifcatory is required in the api_key.private file before uploading.
+#
+#  The script will replace [VER] in the provided remote path with the version found in the framework bundle.
+#
+#  Created by Hedden, Kyle Matthew on 3/2/18.
+#  Copyright © 2018 Verizon. All rights reserved.
+
+URL=$1
+LOCALPATH=$2
+REMOTEPATH=$3
+
+if [ -z $URL ]; then
+    echo "The artifactory instance url must be specified as the first argument!"
+    exit 1
+fi
+
+echo ">>> UPLOAD START <<<"
+echo "Local path: ${LOCALPATH}"
+echo "Remote path: ${REMOTEPATH}"
+
+LOCALBASE=$(basename "${LOCALPATH}")
+LOCALDIR=$(dirname "${LOCALPATH}")
+
+# Grab the framework version from the bundled Info.plist.
+FRAMEWORKVER=$(/usr/libexec/plistbuddy -c "Print :CFBundleShortVersionString" "${LOCALPATH}/Info.plist")
+echo -e "\nFramework version: \t${FRAMEWORKVER}"
+
+# Replace the [VER] placeholders with the found version.
+REMOTEPATH="${REMOTEPATH//\[VER\]/$FRAMEWORKVER}"
+echo -e "Resolved path: \t\t${REMOTEPATH}"
+
+if [ -z $ARTIFACTORY_APIKEY ]; then
+    # Read the API key from a private file.
+    read -r APIKEY < "api_key.private"
+else
+    APIKEY=$ARTIFACTORY_APIKEY
+fi
+
+if [ -z $APIKEY ]; then
+    read -p "Artifactory API Key:" APIKEY
+    echo $APIKEY >> api_key.private
+fi
+
+echo -e "API Key: \t\t${APIKEY}"
+
+# Zip the framework & DSYM for uploading.
+pushd $LOCALDIR
+echo -e "---------\nZipping: \t\t${LOCALBASE}.zip"
+zip -r -X "${LOCALBASE}.zip" $LOCALBASE
+# Generate framework's SHA-1 checksum.
+CHECKSUM=$(shasum -a 1 "${LOCALBASE}.zip" | cut -d " " -f 1)
+echo -e "SHA-1 Checksum: \t${CHECKSUM}"
+if [ -e ${LOCALBASE}.dSYM ]; then
+echo -e "---------\nZipping: \t\t${LOCALBASE}.dSYM.zip"
+zip -r -X "${LOCALBASE}.dSYM.zip" $LOCALBASE.dSYM
+# Generate its SHA-1 checksum for dsym.
+DSYM_CHECKSUM=$(shasum -a 1 "${LOCALBASE}.dSYM.zip" | cut -d " " -f 1)
+echo -e "SHA-1 Checksum: \t${DSYM_CHECKSUM}"
+fi
+popd
+mv ${LOCALPATH}.zip .
+if [ -e ${LOCALPATH}.dSYM.zip ]; then
+mv ${LOCALPATH}.dSYM.zip .
+fi
+
+# Upload framework to Artifactory.
+echo -e "---------\nUploading to: \t\t${URL}/${REMOTEPATH}.zip"
+curl --header "X-JFrog-Art-Api: ${APIKEY}" --header "X-Checksum-Sha1: ${CHECKSUM}" -X PUT "${URL}/${REMOTEPATH}.zip" -T "${LOCALBASE}.zip"
+
+# Cleanup.
+rm "${LOCALBASE}.zip"
+
+if [ -e ${LOCALBASE}.dSYM.zip ]; then
+# Upload dsym Artifactory.
+echo -e "---------\nUploading to: \t\t${URL}/${REMOTEPATH}.dSYM.zip"
+curl --header "X-JFrog-Art-Api: ${APIKEY}" --header "X-Checksum-Sha1: ${DSYM_CHECKSUM}" -X PUT "${URL}/${REMOTEPATH}.dSYM.zip" -T "${LOCALBASE}.dSYM.zip"
+# Cleanup dsym.
+rm ${LOCALBASE}.dSYM.zip
+fi
+
+
+echo -e "\n\n<<< UPLOAD COMPLETE >>>\n\n"
diff --git a/Scripts/upload_remote_view_frameworks.sh b/Scripts/upload_remote_view_frameworks.sh
new file mode 100644
index 0000000..c495882
--- /dev/null
+++ b/Scripts/upload_remote_view_frameworks.sh
@@ -0,0 +1,26 @@
+#!/bin/sh -e
+
+#  upload_remote_view_frameworks.sh
+#
+#  Uploads all compiled framework flavors in RemoteViewFramework to Artifactory with the SNAPSHOT classifier. This is to avoid accidently clobbering a release build of a particular version. Remove the classifier in Artificatory to make a release.
+#
+#  Created by Hedden, Kyle Matthew on 3/2/18.
+#
+
+FRAMEWORK_VERSION=$(cd ../MVMCore && agvtool vers -terse)
+if [ $(git tag --list | grep "v${FRAMEWORK_VERSION}") ]; then
+    echo This version tag has already been committed! Aborting!
+    exit 1
+fi
+
+# Create new aggregate builds
+
+if [ -z $ARTIFACTORY_URL ]; then
+    ARTIFACTORY_URL="https://oneartifactoryprod.verizon.com/artifactory"
+fi
+
+#xcodebuild -workspace "../RemoteView.xcworkspace" -scheme "RemoteViewAggregate"
+
+# Remote View Versions
+
+./upload_framework.sh $ARTIFACTORY_URL "../MVMCore/build/universal/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/[VER]/MVMCore-[VER]-Debug-SNAPSHOT

From 1438a2fafe63933d07b746e76118c68d3c5695e7 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 14:36:21 -0400
Subject: [PATCH 08/25] build

---
 .gitlab-ci.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6665929..d5c02b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
     - test
     - build
-    - deploy
+#    - deploy
 
 test:
   stage: test
@@ -29,21 +29,21 @@ build_project:
   variables:
     ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
 
-deploy_snapshot:
-  stage: deploy
-  script:
-    - cd Scripts && ./upload_remote_view_frameworks.sh
-  only:
-    - branches
-    - feature/testing
-  tags:
-    - bash_shell
-  environment:
-    name: oneartifactory
-    url: https://oneartifactoryprod.verizon.com/artifactory
-  variables:
-    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
-#
+#deploy_snapshot:
+#  stage: deploy
+#  script:
+#    - cd Scripts && ./upload_remote_view_frameworks.sh
+#  only:
+#    - branches
+#    - feature/testing
+#  tags:
+#    - bash_shell
+#  environment:
+#    name: oneartifactory
+#    url: https://oneartifactoryprod.verizon.com/artifactory
+#  variables:
+#    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
+##
 #stages:
 #  #  - test
 #  - build # generate the remote view framework

From f1feda6943d5e2eff81d6b89401fe320922ce41d Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 14:39:07 -0400
Subject: [PATCH 09/25] build

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5c02b0..bd03a39 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ build_project:
     - xcodebuild build -project MVMCore/MVMCore.xcodeproj -scheme FatLibrary | xcpretty
   artifacts:
     paths:
-      - RemoteViewFramework/**
+      - MVMCore/**
     expire_in: 1 week
   only:
     - branches

From 5040ce61add863cf37e4cea2e868a3777e8e175a Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 14:44:36 -0400
Subject: [PATCH 10/25] build

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd03a39..ca743b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ build_project:
     - xcodebuild build -project MVMCore/MVMCore.xcodeproj -scheme FatLibrary | xcpretty
   artifacts:
     paths:
-      - MVMCore/**
+      - */universal/**
     expire_in: 1 week
   only:
     - branches

From 7172880d76067e00220bd122d7f6c9633cb49ef1 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 14:45:31 -0400
Subject: [PATCH 11/25] build

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca743b4..8bb4709 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ build_project:
     - xcodebuild build -project MVMCore/MVMCore.xcodeproj -scheme FatLibrary | xcpretty
   artifacts:
     paths:
-      - */universal/**
+      - MVMCore/build/universal/**
     expire_in: 1 week
   only:
     - branches

From 6045e959c674c2700bdf21369d8ee3d5ebcdd9d8 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 15:00:37 -0400
Subject: [PATCH 12/25] deploy

---
 .gitlab-ci.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bb4709..b396cb6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
     - test
     - build
-#    - deploy
+    - deploy
 
 test:
   stage: test
@@ -29,20 +29,20 @@ build_project:
   variables:
     ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
 
-#deploy_snapshot:
-#  stage: deploy
-#  script:
-#    - cd Scripts && ./upload_remote_view_frameworks.sh
-#  only:
-#    - branches
-#    - feature/testing
-#  tags:
-#    - bash_shell
-#  environment:
-#    name: oneartifactory
-#    url: https://oneartifactoryprod.verizon.com/artifactory
-#  variables:
-#    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
+deploy_snapshot:
+  stage: deploy
+  script:
+    - cd Scripts && ./upload_remote_view_frameworks.sh
+  only:
+    - branches
+    - feature/testing
+  tags:
+    - bash_shell
+  environment:
+    name: oneartifactory
+    url: https://oneartifactoryprod.verizon.com/artifactory
+  variables:
+    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
 ##
 #stages:
 #  #  - test

From 9b56fc2f0d71a43bbffa6045965091de4d48b868 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 15:04:28 -0400
Subject: [PATCH 13/25] deploy

---
 Scripts/upload_framework.sh              | 0
 Scripts/upload_remote_view_frameworks.sh | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 Scripts/upload_framework.sh
 mode change 100644 => 100755 Scripts/upload_remote_view_frameworks.sh

diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh
old mode 100644
new mode 100755
diff --git a/Scripts/upload_remote_view_frameworks.sh b/Scripts/upload_remote_view_frameworks.sh
old mode 100644
new mode 100755

From a8e2d1e6a1c52f994813b6a0bd8507a45adb910d Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 15:10:51 -0400
Subject: [PATCH 14/25] deploy

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b396cb6..3708082 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ build_project:
     - xcodebuild build -project MVMCore/MVMCore.xcodeproj -scheme FatLibrary | xcpretty
   artifacts:
     paths:
-      - MVMCore/build/universal/**
+      - MVMCore/build/universal/MVMCore.framework
     expire_in: 1 week
   only:
     - branches

From 1099dae8b05f1930983e7f6ba625a0b0a8bb87d3 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 15:14:15 -0400
Subject: [PATCH 15/25] deploy

---
 Scripts/upload_framework.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh
index c1e5990..a6179ed 100755
--- a/Scripts/upload_framework.sh
+++ b/Scripts/upload_framework.sh
@@ -25,6 +25,9 @@ echo ">>> UPLOAD START <<<"
 echo "Local path: ${LOCALPATH}"
 echo "Remote path: ${REMOTEPATH}"
 
+ls "${LOCALPATH}"
+cat "${LOCALPATH}/Info.plist"
+
 LOCALBASE=$(basename "${LOCALPATH}")
 LOCALDIR=$(dirname "${LOCALPATH}")
 

From 25b6e31b86c06c7555f7a22a519c7bfd398301cd Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 15:15:35 -0400
Subject: [PATCH 16/25] deploy

---
 Scripts/upload_framework.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh
index a6179ed..522430e 100755
--- a/Scripts/upload_framework.sh
+++ b/Scripts/upload_framework.sh
@@ -25,7 +25,7 @@ echo ">>> UPLOAD START <<<"
 echo "Local path: ${LOCALPATH}"
 echo "Remote path: ${REMOTEPATH}"
 
-ls "${LOCALPATH}"
+ls
 cat "${LOCALPATH}/Info.plist"
 
 LOCALBASE=$(basename "${LOCALPATH}")

From df174d584090c54e7f8de00e7d6609adb427ba1f Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 15:18:09 -0400
Subject: [PATCH 17/25] deploy

---
 Scripts/upload_framework.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh
index 522430e..59d547f 100755
--- a/Scripts/upload_framework.sh
+++ b/Scripts/upload_framework.sh
@@ -25,7 +25,7 @@ echo ">>> UPLOAD START <<<"
 echo "Local path: ${LOCALPATH}"
 echo "Remote path: ${REMOTEPATH}"
 
-ls
+ls ".."
 cat "${LOCALPATH}/Info.plist"
 
 LOCALBASE=$(basename "${LOCALPATH}")

From 21ba4900edf1ce834f8773e791659120c8cc347d Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 15:19:59 -0400
Subject: [PATCH 18/25] deploy

---
 Scripts/upload_framework.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh
index 59d547f..5af01dd 100755
--- a/Scripts/upload_framework.sh
+++ b/Scripts/upload_framework.sh
@@ -25,7 +25,10 @@ echo ">>> UPLOAD START <<<"
 echo "Local path: ${LOCALPATH}"
 echo "Remote path: ${REMOTEPATH}"
 
-ls ".."
+ls "../MVMCore"
+ls "../MVMCore/build"
+ls "../MVMCore/build/universal"
+
 cat "${LOCALPATH}/Info.plist"
 
 LOCALBASE=$(basename "${LOCALPATH}")

From ab6635c73e5d6ead44bc0535e910d1411109b4cb Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 15:26:54 -0400
Subject: [PATCH 19/25] deploy

---
 Scripts/upload_framework.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh
index 5af01dd..0f312f0 100755
--- a/Scripts/upload_framework.sh
+++ b/Scripts/upload_framework.sh
@@ -26,6 +26,7 @@ echo "Local path: ${LOCALPATH}"
 echo "Remote path: ${REMOTEPATH}"
 
 ls "../MVMCore"
+ls "../MVMCore/MVMCore"
 ls "../MVMCore/build"
 ls "../MVMCore/build/universal"
 

From eb0b4692b18a8c390dde56c70d8d3504c0183b62 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 17:30:55 -0400
Subject: [PATCH 20/25] fixes

---
 .gitlab-ci.yml                           | 3 ++-
 Scripts/upload_framework.sh              | 5 -----
 Scripts/upload_remote_view_frameworks.sh | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3708082..43842be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,9 +14,10 @@ build_project:
   stage: build
   script:
     - xcodebuild build -project MVMCore/MVMCore.xcodeproj -scheme FatLibrary | xcpretty
+    - BUILD_DIR=$(xcodebuild -showBuildSettings -project MVMCore/MVMCore.xcodeproj | grep BUILD_DIR)
   artifacts:
     paths:
-      - MVMCore/build/universal/MVMCore.framework
+      - ${BUILD_DIR}/universal/MVMCore.framework
     expire_in: 1 week
   only:
     - branches
diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh
index 0f312f0..5003d7e 100755
--- a/Scripts/upload_framework.sh
+++ b/Scripts/upload_framework.sh
@@ -25,11 +25,6 @@ echo ">>> UPLOAD START <<<"
 echo "Local path: ${LOCALPATH}"
 echo "Remote path: ${REMOTEPATH}"
 
-ls "../MVMCore"
-ls "../MVMCore/MVMCore"
-ls "../MVMCore/build"
-ls "../MVMCore/build/universal"
-
 cat "${LOCALPATH}/Info.plist"
 
 LOCALBASE=$(basename "${LOCALPATH}")
diff --git a/Scripts/upload_remote_view_frameworks.sh b/Scripts/upload_remote_view_frameworks.sh
index c495882..6e7cd65 100755
--- a/Scripts/upload_remote_view_frameworks.sh
+++ b/Scripts/upload_remote_view_frameworks.sh
@@ -22,5 +22,5 @@ fi
 #xcodebuild -workspace "../RemoteView.xcworkspace" -scheme "RemoteViewAggregate"
 
 # Remote View Versions
-
-./upload_framework.sh $ARTIFACTORY_URL "../MVMCore/build/universal/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/[VER]/MVMCore-[VER]-Debug-SNAPSHOT
+BUILD_DIR=$(xcodebuild -showBuildSettings -project ../MVMCore/MVMCore.xcodeproj | grep BUILD_DIR)
+./upload_framework.sh $ARTIFACTORY_URL "${BUILD_DIR}/universal/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/[VER]/MVMCore-[VER]-Debug-SNAPSHOT

From 7936d1d51f8a13b89d49678d5d3660d40f04d4b1 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 17:55:15 -0400
Subject: [PATCH 21/25] path fix

---
 Scripts/upload_remote_view_frameworks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/upload_remote_view_frameworks.sh b/Scripts/upload_remote_view_frameworks.sh
index 6e7cd65..84c6a29 100755
--- a/Scripts/upload_remote_view_frameworks.sh
+++ b/Scripts/upload_remote_view_frameworks.sh
@@ -22,5 +22,5 @@ fi
 #xcodebuild -workspace "../RemoteView.xcworkspace" -scheme "RemoteViewAggregate"
 
 # Remote View Versions
-BUILD_DIR=$(xcodebuild -showBuildSettings -project ../MVMCore/MVMCore.xcodeproj | grep BUILD_DIR)
+BUILD_DIR=$(xcodebuild -showBuildSettings -project MVMCore/MVMCore.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\  -f3-)
 ./upload_framework.sh $ARTIFACTORY_URL "${BUILD_DIR}/universal/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/[VER]/MVMCore-[VER]-Debug-SNAPSHOT

From 180c8503b0417804c4a8a5796e37477ae6e9d996 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 28 Jun 2021 17:59:37 -0400
Subject: [PATCH 22/25] path fix

---
 Scripts/upload_remote_view_frameworks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/upload_remote_view_frameworks.sh b/Scripts/upload_remote_view_frameworks.sh
index 84c6a29..1ff2744 100755
--- a/Scripts/upload_remote_view_frameworks.sh
+++ b/Scripts/upload_remote_view_frameworks.sh
@@ -22,5 +22,5 @@ fi
 #xcodebuild -workspace "../RemoteView.xcworkspace" -scheme "RemoteViewAggregate"
 
 # Remote View Versions
-BUILD_DIR=$(xcodebuild -showBuildSettings -project MVMCore/MVMCore.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\  -f3-)
+BUILD_DIR=$(xcodebuild -showBuildSettings -project ../MVMCore/MVMCore.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\  -f3-)
 ./upload_framework.sh $ARTIFACTORY_URL "${BUILD_DIR}/universal/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/[VER]/MVMCore-[VER]-Debug-SNAPSHOT

From ff760a2c2f450cbcf0300ae12ceead3135f58ae2 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Tue, 29 Jun 2021 09:29:36 -0400
Subject: [PATCH 23/25] api key change

---
 .gitlab-ci.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43842be..b58d2a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,11 +24,6 @@ build_project:
     - feature/testing
   tags:
     - xcode_12_2
-  environment:
-    name: oneartifactory
-    url: https://oneartifactoryprod.verizon.com/artifactory
-  variables:
-    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
 
 deploy_snapshot:
   stage: deploy

From b3da2f73742939a6ac09cd6ea58c590501ef3fd7 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Tue, 29 Jun 2021 09:49:24 -0400
Subject: [PATCH 24/25] api key change

---
 .gitlab-ci.yml | 66 ++++++--------------------------------------------
 1 file changed, 7 insertions(+), 59 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b58d2a7..10060ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,22 +3,18 @@ stages:
     - build
     - deploy
 
-test:
-  stage: test
-  script:
-    - echo "This job tests something"
-  tags:
-    - xcode_12_2
+#test:
+#  stage: test
+#  script:
+#    - echo "This job tests something"
+#  tags:
+#    - xcode_12_2
     
 build_project:
   stage: build
   script:
     - xcodebuild build -project MVMCore/MVMCore.xcodeproj -scheme FatLibrary | xcpretty
     - BUILD_DIR=$(xcodebuild -showBuildSettings -project MVMCore/MVMCore.xcodeproj | grep BUILD_DIR)
-  artifacts:
-    paths:
-      - ${BUILD_DIR}/universal/MVMCore.framework
-    expire_in: 1 week
   only:
     - branches
     - feature/testing
@@ -39,55 +35,7 @@ deploy_snapshot:
     url: https://oneartifactoryprod.verizon.com/artifactory
   variables:
     ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
-##
-#stages:
-#  #  - test
-#  - build # generate the remote view framework
-#  - deploy # deploy the framework to Artifactory as a snapshot
-#  - tag # on manual confirmation, tag the repository
-#  - go live # move the snapshot binary on artifactory into live status
-#
-##run_unit_tests:
-##  stage: test
-##  script:
-##    - xcodebuild test -project ProjectName.xcodeproj -scheme SchemeName -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.2' | xcpretty -s
-##  tags:
-##    - xcode_12
-#
-#build_project:
-#  stage: build
-#  script:
-#    - xcodebuild build -workspace RemoteView.xcworkspace -scheme RemoteViewAggregate | xcpretty
-#  artifacts:
-#    paths:
-#      - RemoteViewFramework/**
-#    expire_in: 1 week
-#  only:
-#    - branches
-#    - develop
-#  tags:
-#    - xcode_12_2
-#  environment:
-#    name: oneartifactory
-#    url: https://oneartifactoryprod.verizon.com/artifactory
-#  variables:
-#    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
-#
-#deploy_snapshot:
-#  stage: deploy
-#  script:
-#    - cd Scripts && ./upload_remote_view_frameworks.sh
-#  only:
-#    - branches
-#    - develop
-#  tags:
-#    - bash_shell
-#  environment:
-#    name: oneartifactory
-#    url: https://oneartifactoryprod.verizon.com/artifactory
-#  variables:
-#    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
-#
+
 #promote_snapshot:
 #  stage: go live
 #  # Prevent artifacts from needing to re-download. Everything we need is in Artifactory.

From 43135e9214bf0c3f7d088aad7a4f4b159c940241 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Tue, 29 Jun 2021 09:56:00 -0400
Subject: [PATCH 25/25] api key change

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10060ae..4f2e7aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ build_project:
     - BUILD_DIR=$(xcodebuild -showBuildSettings -project MVMCore/MVMCore.xcodeproj | grep BUILD_DIR)
   only:
     - branches
-    - feature/testing
+    - develop
   tags:
     - xcode_12_2
 
@@ -27,7 +27,7 @@ deploy_snapshot:
     - cd Scripts && ./upload_remote_view_frameworks.sh
   only:
     - branches
-    - feature/testing
+    - develop
   tags:
     - bash_shell
   environment: