From 770620c0430e1cd440c1e2fad0d4e52bbb434ba3 Mon Sep 17 00:00:00 2001
From: Enrico Zannini <enricozannini93@gmail.com>
Date: Fri, 8 Mar 2024 14:49:37 +0100
Subject: [PATCH] [MT-1497] Version 3.2.0 (#18)

Update to target XCode 15 and iOS 12
Add publish and build scripts
---
 .gitignore                             |   5 +-
 Cartfile                               |   2 +-
 Package.swift                          |   4 +-
 SM/Surfile                             |  38 ++++++
 Sources/BrazeConstants.swift           |   2 +-
 TealiumBraze.podspec                   |   9 +-
 TealiumBraze.xcodeproj/project.pbxproj |   6 +-
 TealiumBrazeExample/Podfile            |   2 +-
 TealiumBrazeExample/Podfile.lock       |  22 ++--
 publish.sh                             |  67 ++++++++++
 xcframeworks.sh                        | 171 ++-----------------------
 11 files changed, 145 insertions(+), 183 deletions(-)
 create mode 100644 SM/Surfile
 create mode 100644 publish.sh

diff --git a/.gitignore b/.gitignore
index 325bfab..c62c798 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,4 +58,7 @@ Pods/
 Carthage/
 
 ## Tealium Example App
-TealiumBraze/TealiumBrazeExample/Pods/
\ No newline at end of file
+TealiumBraze/TealiumBrazeExample/Pods/
+
+tealium-xcframeworks/
+tealium.xcframework.zip
\ No newline at end of file
diff --git a/Cartfile b/Cartfile
index a5c5330..a61bb94 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,2 +1,2 @@
-github "tealium/tealium-swift" ~> 2.8
+github "tealium/tealium-swift" ~> 2.12
 binary "https://raw.githubusercontent.com/Tealium/tealium-ios-braze-remote-command/main/braze.json" ~> 7.2
diff --git a/Package.swift b/Package.swift
index 553cf12..43632d7 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,13 +4,13 @@ import PackageDescription
 let package = Package(
     name: "TealiumBraze",
     platforms: [
-        .iOS(.v10)
+        .iOS(.v12)
     ],
     products: [
         .library(name: "TealiumBraze", targets: ["TealiumBraze"])
     ],
     dependencies: [
-        .package(url: "https://github.com/tealium/tealium-swift", .upToNextMajor(from: "2.8.0")),
+        .package(url: "https://github.com/tealium/tealium-swift", .upToNextMajor(from: "2.12.0")),
         .package(url: "https://github.com/braze-inc/braze-swift-sdk", .upToNextMajor(from: "7.2.0"))
     ],
     targets: [
diff --git a/SM/Surfile b/SM/Surfile
new file mode 100644
index 0000000..688c390
--- /dev/null
+++ b/SM/Surfile
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>output_path</key>
+        <string>tealium-xcframeworks</string>
+        <key>frameworks</key>
+        <array>
+            <dict>
+                <key>name</key>
+                <string>TealiumBraze</string>
+                <key>targets</key>
+                <array>
+                    <dict>
+                        <key>sdk</key>
+                        <string>iOS</string>
+                        <key>project</key>
+                        <string>TealiumBraze.xcodeproj</string>
+                        <key>scheme</key>
+                        <string>TealiumBraze</string>
+                    </dict>
+                    <dict>
+                        <key>sdk</key>
+                        <string>iOSSimulator</string>
+                        <key>project</key>
+                        <string>TealiumBraze.xcodeproj</string>
+                        <key>scheme</key>
+                        <string>TealiumBraze</string>
+                    </dict>
+                </array>
+            </dict>
+        </array>
+        <key>finalActions</key>
+        <array>
+            <string>openDirectory</string>
+        </array>
+    </dict>
+</plist>
\ No newline at end of file
diff --git a/Sources/BrazeConstants.swift b/Sources/BrazeConstants.swift
index c8c35af..77a9b5c 100644
--- a/Sources/BrazeConstants.swift
+++ b/Sources/BrazeConstants.swift
@@ -14,7 +14,7 @@ public enum BrazeConstants {
     static let separator: Character = ","
     static let commandId = "braze"
     static let description = "Braze Remote Command"
-    static let version = "3.1.1"
+    static let version = "3.2.0"
     
     enum Commands: String {
         case initialize = "initialize"
diff --git a/TealiumBraze.podspec b/TealiumBraze.podspec
index 0e46feb..907fab6 100644
--- a/TealiumBraze.podspec
+++ b/TealiumBraze.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
     # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
     s.name         = "TealiumBraze"
     s.module_name  = "TealiumBraze"
-    s.version      = "3.1.1"
+    s.version      = "3.2.0"
     s.summary      = "Tealium Swift and Braze integration"
     s.description  = <<-DESC
     Tealium's integration with Braze for iOS.
@@ -21,8 +21,7 @@ Pod::Spec.new do |s|
 
     # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
     s.swift_version = "5.0"
-    s.platform     = :ios, "11.0"
-    s.ios.deployment_target = "11.0"
+    s.platform     = :ios, "12.0"
 
     # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
     s.source       = { :git => "https://github.com/Tealium/tealium-ios-braze-remote-command.git", :tag => "#{s.version}" }
@@ -31,8 +30,8 @@ Pod::Spec.new do |s|
     s.ios.source_files      = "Sources/*.{swift}"
 
     # ――― Dependencies ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
-    s.ios.dependency 'tealium-swift/Core', '~> 2.8'
-    s.ios.dependency 'tealium-swift/RemoteCommands', '~> 2.8'
+    s.ios.dependency 'tealium-swift/Core', '~> 2.12'
+    s.ios.dependency 'tealium-swift/RemoteCommands', '~> 2.12'
     s.ios.dependency 'BrazeKit', '~> 7.2'
     s.static_framework = true
 
diff --git a/TealiumBraze.xcodeproj/project.pbxproj b/TealiumBraze.xcodeproj/project.pbxproj
index f4e2d06..c7390ac 100644
--- a/TealiumBraze.xcodeproj/project.pbxproj
+++ b/TealiumBraze.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -443,7 +443,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -477,7 +477,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/TealiumBrazeExample/Podfile b/TealiumBrazeExample/Podfile
index ae70419..c8ee1ee 100644
--- a/TealiumBrazeExample/Podfile
+++ b/TealiumBrazeExample/Podfile
@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 target 'TealiumBrazeExample' do
   # Comment the next line if you don't want to use dynamic frameworks
diff --git a/TealiumBrazeExample/Podfile.lock b/TealiumBrazeExample/Podfile.lock
index 544e88b..116d16f 100644
--- a/TealiumBrazeExample/Podfile.lock
+++ b/TealiumBrazeExample/Podfile.lock
@@ -2,17 +2,17 @@ PODS:
   - BrazeKit (7.2.0)
   - BrazeLocation (7.2.0):
     - BrazeKit (= 7.2.0)
-  - tealium-swift/Core (2.10.1)
-  - tealium-swift/Lifecycle (2.10.1):
+  - tealium-swift/Core (2.12.2)
+  - tealium-swift/Lifecycle (2.12.2):
     - tealium-swift/Core
-  - tealium-swift/RemoteCommands (2.10.1):
+  - tealium-swift/RemoteCommands (2.12.2):
     - tealium-swift/Core
-  - tealium-swift/TagManagement (2.10.1):
+  - tealium-swift/TagManagement (2.12.2):
     - tealium-swift/Core
-  - TealiumBraze (3.0.0):
+  - TealiumBraze (3.2.0):
     - BrazeKit (~> 7.2)
-    - tealium-swift/Core (~> 2.8)
-    - tealium-swift/RemoteCommands (~> 2.8)
+    - tealium-swift/Core (~> 2.12)
+    - tealium-swift/RemoteCommands (~> 2.12)
 
 DEPENDENCIES:
   - BrazeLocation
@@ -33,9 +33,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   BrazeKit: 3c77dfdf4e96e4ad8636523415e93669b89e26e0
   BrazeLocation: 188b5a4210cdac88b5f19f455a1317ed7b809040
-  tealium-swift: 9ec83baf5419d0bb1e95b184288231e27385015b
-  TealiumBraze: ff3cadbc6f8351a40467c63a32b97ea93438c479
+  tealium-swift: 4b7e3dda42d7c1de6acb769abad9920346d17d43
+  TealiumBraze: 9de0067b72a00c7d3b0ad67bee501a34518b4e06
 
-PODFILE CHECKSUM: 882a9d422c74901cbba8507cb6a543b4c7999cb4
+PODFILE CHECKSUM: bd36620a6237490c846dcfc61142c9bc2791390d
 
-COCOAPODS: 1.14.2
+COCOAPODS: 1.15.2
diff --git a/publish.sh b/publish.sh
new file mode 100644
index 0000000..94cbb8c
--- /dev/null
+++ b/publish.sh
@@ -0,0 +1,67 @@
+# A script to verify that the repo is up to date and the versions are correct and then runs the pod trunk push command
+
+constants=$(<Sources/BrazeConstants.swift)
+regex="^.*static let version \= \"([0-9\.]*)\""
+
+if [[ $constants =~ $regex ]]
+then
+    versionConstant=${BASH_REMATCH[1]}
+else
+    echo "Couldn't match the library version, exiting"
+    exit 1
+fi
+echo Version Constant $versionConstant
+
+podspecFile=$(<TealiumBraze.podspec)
+podspecRegex="^.*s.version[[:space:]]*\= \"([0-9\.]*)\""
+
+if [[ $podspecFile =~ $podspecRegex ]]
+then
+    podspecVersion=${BASH_REMATCH[1]}
+else
+    echo "Couldn't match the podspec version, exiting"
+    exit 1
+fi
+echo Podspec Version  $podspecVersion
+
+if [ $podspecVersion != $versionConstant ]
+then
+  echo "The podspec version \"${podspecVersion}\" is different from the version constant \"${versionConstant}\".\nDid you forget to update one of the two?"
+  exit 1
+fi
+
+branch_name="$(git rev-parse --abbrev-ref HEAD)"
+echo Current branch $branch_name
+if [ $branch_name != "main" ]
+then 
+  echo "Check out to main branch before trying to publish. Current branch: ${branch_name}"
+  exit 1
+fi
+
+git fetch --tags
+if ! git diff --quiet remotes/origin/main
+then
+  echo "Make sure you are up to date with the remote before publishing"
+  exit 1
+fi
+
+latestTag=$(git describe --tags --abbrev=0)
+
+echo Latest tag $latestTag
+if [ $latestTag != $versionConstant ]
+then
+  echo "The latest published tag \"${latestTag}\" is different from the version constant \"${versionConstant}\".\nDid you forget to add the tag to the release or did you forget to update the Constant?"
+  exit 1
+fi
+
+
+
+echo "All checks are passed, ready to release to CocoaPods"
+
+echo "Do you wish to publish to CocoaPods?"
+select yn in "Yes" "No"; do
+    case $yn in
+        Yes ) echo "Ok, running \"pod trunk push\" now."; pod trunk push; break;;
+        No ) echo "Ok, skip the release for now."; exit;;
+    esac
+done
\ No newline at end of file
diff --git a/xcframeworks.sh b/xcframeworks.sh
index fc2493b..bcec348 100755
--- a/xcframeworks.sh
+++ b/xcframeworks.sh
@@ -1,175 +1,30 @@
 #!/bin/bash
 
-#######################################################
-# xcframework builder script for tealium-swift
-#######################################################
-
 # variable declarations
 BUILD_PATH="build"
 XCFRAMEWORK_PATH="tealium-xcframeworks"
-ZIP_PATH="TealiumBraze.xcframework.zip"
-XCODE_PROJECT="TealiumBraze"
-MACOS_SDKROOT="SDKROOT = macosx;"
-IOS_SDKROOT="SDKROOT = \"iphoneos\";"
-LATEST_MAJOR="2."
-PREVIOUS_MAJOR="1."
-IOS_ONLY_PRODUCTS="TealiumBraze"
-declare -a PRODUCT_NAME
-# destinations
-IOS_SIM_DESTINATION="generic/platform=iOS Simulator"
-IOS_DESTINATION="generic/platform=iOS"
-TVOS_SIM_DESTINATION="generic/platform=tvOS Simulator"
-TVOS_DESTINATION="generic/platform=tvOS"
-WATCHOS_SIM_DESTINATION="generic/platform=watchOS Simulator"
-WATCHOS_DESTINATION="generic/platform=watchOS"
-MACOS_DESTINATION="generic/platform=macOS"
-
-# xcarchives
-IOS_SIM_ARCHIVE="ios-sim.xcarchive"
-IOS_ARCHIVE="ios.xcarchive"
-TVOS_SIM_ARCHIVE="tvos-sim.xcarchive"
-TVOS_ARCHIVE="tvos.xcarchive"
-WATCHOS_SIM_ARCHIVE="watchos-sim.xcarchive"
-WATCHOS_ARCHIVE="watchos.xcarchive"
-MACOS_ARCHIVE="macos.xcarchive"
-
-# function declarations
-function define_product_name {
-    case $1 in
-        *"$LATEST_MAJOR"*)
-            PRODUCT_NAME=(TealiumBraze)
-            ;;
-        *"$PREVIOUS_MAJOR"*)
-            PRODUCT_NAME=(TealiumBraze)
-            ;;
-        *)
-            echo "ERROR, VERSION NUMBER INVALID"
-            ;;
-    esac    
-}
-
-function clean_build_folder {
-    if [[ -d "${BUILD_PATH}" ]]; then
-        rm -rf "${BUILD_PATH}"
-    fi
-    if [[ -d "${XCFRAMEWORK_PATH}" ]]; then
-        rm -rf "${XCFRAMEWORK_PATH}"
-    fi
-    if [[ -d "${ZIP_PATH}" ]]; then
-        rm "${ZIP_PATH}"
-    fi
-    mkdir "${XCFRAMEWORK_PATH}"
-}
-
-function check_architecture {
-    local archs=( "$@" )
-    for arch in "${archs[@]}"
-    do 
-        if ! echo "$1" | grep -q "${arch}"; then
-            echo "ERROR, ARCHITECTURE MISSING!!!"
-        else              # uncomment for debugging
-            echo "+found ${arch}"
-        fi
-    done
-}
-
-# create indv archive
-function archive {
-    xcodebuild archive \
-    -project "${XCODE_PROJECT}.xcodeproj" \
-    -scheme "${1}" \
-    -destination "${2}" \
-    -archivePath "${3}" \
-    -sdk "${4}" \
-    SKIP_INSTALL=NO \
-    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
-    SUPPORTS_MACCATALYST=NO \
-    BUILD_SCRIPT=YES
-    echo "Archiving ${1} ${2} ${3} ${4}"   
-}
-
-# create xcframeworks for ios only products
-function create_xcframework_ios_only {
-        xcodebuild -create-xcframework \
-        -framework "${BUILD_PATH}/${IOS_SIM_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-        -framework "${BUILD_PATH}/${IOS_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-        -output "${XCFRAMEWORK_PATH}/${1}".xcframework;
-}
-
-# create xcframeworks for products supporting all platforms
-function create_xcframework_all {
-    xcodebuild -create-xcframework \
-    -framework "${BUILD_PATH}/${IOS_SIM_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-    -framework "${BUILD_PATH}/${IOS_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-    -framework "${BUILD_PATH}/${TVOS_SIM_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-    -framework "${BUILD_PATH}/${TVOS_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-    -framework "${BUILD_PATH}/${WATCHOS_SIM_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-    -framework "${BUILD_PATH}/${WATCHOS_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-    -framework "${BUILD_PATH}/${MACOS_ARCHIVE}/Products/Library/Frameworks/${1}.framework" \
-    -output "${XCFRAMEWORK_PATH}/${1}".xcframework;
-}
-
-# create xcframework for each product that contains all supported platforms
-function create_xcframework {   
-    if [[ "$IOS_ONLY_PRODUCTS" == *"$1"* ]]; then
-        create_xcframework_ios_only "${1}"   
-    else
-        create_xcframework_all "${1}"
-    fi
-}
-
-# create archives for ios only products
-function create_archives_ios_only {
-    archive "$1" "${IOS_SIM_DESTINATION}" "${BUILD_PATH}/${IOS_SIM_ARCHIVE}" "iphonesimulator"
-    archive "$1" "${IOS_DESTINATION}" "${BUILD_PATH}/${IOS_ARCHIVE}" "iphoneos";
-    create_xcframework "$1"
-}
-
-# create archives for products supporting all platforms
-function create_archives_all {
-    archive "$1" "${IOS_SIM_DESTINATION}" "${BUILD_PATH}/${IOS_SIM_ARCHIVE}" "iphonesimulator"
-    archive "$1" "${IOS_DESTINATION}" "${BUILD_PATH}/${IOS_ARCHIVE}" "iphoneos"
-    archive "$1" "${TVOS_SIM_DESTINATION}" "${BUILD_PATH}/${TVOS_SIM_ARCHIVE}" "appletvsimulator"
-    archive "$1" "${TVOS_DESTINATION}" "${BUILD_PATH}/${TVOS_ARCHIVE}" "appletvos"
-    archive "$1" "${WATCHOS_SIM_DESTINATION}" "${BUILD_PATH}/${WATCHOS_SIM_ARCHIVE}" "watchsimulator"
-    archive "$1" "${WATCHOS_DESTINATION}" "${BUILD_PATH}/${WATCHOS_ARCHIVE}" "watchos"
-    archive "$1" "${MACOS_DESTINATION}" "${BUILD_PATH}/${MACOS_ARCHIVE}" "macosx"
-    create_xcframework "$1" 
-}
-
-# create all archives for each product and platform
-function create_archives {
-    if [ -z "$1" ]
-      then
-        echo "WARNING, NO VERSION NUMBER ENTERED. ASSUMING LATEST."
-        define_product_name "${LATEST_MAJOR}"
-    else
-        define_product_name "$1"
-    fi
-    for i in "${PRODUCT_NAME[@]}"; 
-        do
-            if [[ "$IOS_ONLY_PRODUCTS" == *"$i"* ]]; then                
-                create_archives_ios_only "$i"
-            else
-                create_archives_all "$i" 
-            fi    
-        done    
-}
+ZIP_PATH="tealium.xcframework.zip"
+TEAM_NAME=XC939GDC9P
 
 # zip all the xcframeworks
 function zip_xcframeworks {
     if [[ -d "${XCFRAMEWORK_PATH}" ]]; then
-        zip -r "${ZIP_PATH}" "${XCFRAMEWORK_PATH}"
+        ditto -ck --rsrc --sequesterRsrc --keepParent "${XCFRAMEWORK_PATH}" "${ZIP_PATH}" 
         rm -rf "${XCFRAMEWORK_PATH}"
     fi
 }
 
-#### start ####
-clean_build_folder
-
 # do the work
-create_archives "$1"
+surmagic xcf
+
+# Code Sign
+for frameworkname in $XCFRAMEWORK_PATH/*.xcframework; do
+    echo "Codesigning $frameworkname"
+    codesign --timestamp -s $TEAM_NAME $frameworkname --verbose
+    codesign -v $frameworkname --verbose
+done
+
 zip_xcframeworks
 
 echo ""
-echo "Done! Upload ${ZIP_PATH} to GitHub when you create the release."
+echo "Done! Upload ${ZIP_PATH} to GitHub when you create the release."
\ No newline at end of file