5.6.4 - added device_type and updated samples (#123)

Tealium · Nov 5, 2019 · 621b0d0 · 621b0d0
1 parent 2edbdcc
commit 621b0d0
Show file tree

Hide file tree

Showing 31 changed files with 166 additions and 98 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Change Log
-
+- 5.6.4
+ - Added additional device_type variable that includes Apple device name (e.g 
+ "iPhone10,4") 
 - 5.6.3
  - Bug Fix
  - Safely remove dispatch services while enumerating through array

diff --git a/Samples/ConsentManagerDemo_ObjC/ConsentManagerDemo_ObjC.xcodeproj/project.pbxproj b/Samples/ConsentManagerDemo_ObjC/ConsentManagerDemo_ObjC.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
  objects = {
 
 /* Begin PBXBuildFile section */
- 31E842866A73F54D74926B18 /* Pods_ConsentManagerDemo_ObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A94D9390CDE75BF51B4B7210 /* Pods_ConsentManagerDemo_ObjC.framework */; };
  4B0357B420BDF6AD0064A6EE /* SliderPreferencesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0357B320BDF6AD0064A6EE /* SliderPreferencesTableViewController.swift */; };
  4B0357B620D01B170064A6EE /* SwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0357B520D01B170064A6EE /* SwitchTableViewCell.swift */; };
  4B0357B820D030160064A6EE /* TitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0357B720D030160064A6EE /* TitleTableViewCell.swift */; };
@@ -21,9 +20,11 @@
  4B2A119020B8C8E800BCE2C6 /* HomeTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A118F20B8C8E800BCE2C6 /* HomeTableViewController.swift */; };
  4B2A119220B8D23F00BCE2C6 /* SimplePreferencesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2A119120B8D23F00BCE2C6 /* SimplePreferencesTableViewController.swift */; };
  4B858EDB20FFB77A002D5D20 /* TealiumHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B858EDA20FFB77A002D5D20 /* TealiumHelper.m */; };
+ 61B04BF27C4CF6FE9701E666 /* Pods_ConsentManagerDemo_ObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 608A0BD3510355A136191D8F /* Pods_ConsentManagerDemo_ObjC.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+ 12481115152069B8FD46BB95 /* Pods-ConsentManagerDemo_ObjC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConsentManagerDemo_ObjC.release.xcconfig"; path = "Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC.release.xcconfig"; sourceTree = "<group>"; };
  4B0357B320BDF6AD0064A6EE /* SliderPreferencesTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SliderPreferencesTableViewController.swift; sourceTree = "<group>"; };
  4B0357B520D01B170064A6EE /* SwitchTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitchTableViewCell.swift; sourceTree = "<group>"; };
  4B0357B720D030160064A6EE /* TitleTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleTableViewCell.swift; sourceTree = "<group>"; };
@@ -42,17 +43,16 @@
  4B858ED920FFB77A002D5D20 /* TealiumHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TealiumHelper.h; sourceTree = "<group>"; };
  4B858EDA20FFB77A002D5D20 /* TealiumHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TealiumHelper.m; sourceTree = "<group>"; };
  4BAE554E20EA9FC7007551B9 /* TealiumIOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TealiumIOS.framework; path = "../../../../Library/Developer/Xcode/DerivedData/FrameworkBuilder-dmbnvbrnwapxjacsxxaxikshtzto/Build/Products/Release-iphonesimulator/TealiumIOS.framework"; sourceTree = "<group>"; };
- 773AF55DF20709642C6AEF70 /* Pods-ConsentManagerDemo_ObjC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConsentManagerDemo_ObjC.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC.debug.xcconfig"; sourceTree = "<group>"; };
- A94D9390CDE75BF51B4B7210 /* Pods_ConsentManagerDemo_ObjC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ConsentManagerDemo_ObjC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- BDDD39FF220E3678643D177B /* Pods-ConsentManagerDemo_ObjC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConsentManagerDemo_ObjC.release.xcconfig"; path = "Pods/Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC.release.xcconfig"; sourceTree = "<group>"; };
+ 608A0BD3510355A136191D8F /* Pods_ConsentManagerDemo_ObjC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ConsentManagerDemo_ObjC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ B7077D54415483B00774AC67 /* Pods-ConsentManagerDemo_ObjC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ConsentManagerDemo_ObjC.debug.xcconfig"; path = "Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
  4B2A116720B8625000BCE2C6 /* Frameworks */ = {
  isa = PBXFrameworksBuildPhase;
  buildActionMask = 2147483647;
  files = (
- 31E842866A73F54D74926B18 /* Pods_ConsentManagerDemo_ObjC.framework in Frameworks */,
+ 61B04BF27C4CF6FE9701E666 /* Pods_ConsentManagerDemo_ObjC.framework in Frameworks */,
  );
  runOnlyForDeploymentPostprocessing = 0;
  };
@@ -74,7 +74,7 @@
  4B2A116C20B8625000BCE2C6 /* ConsentManagerDemo_ObjC */,
  4B2A116B20B8625000BCE2C6 /* Products */,
  4BAE554D20EA9FC7007551B9 /* Frameworks */,
- FCCE0DD88AAEC79DF1F02FE8 /* Pods */,
+ A8491F919A337933A79E0C4D /* Pods */,
  );
  sourceTree = "<group>";
  };
@@ -112,18 +112,19 @@
  isa = PBXGroup;
  children = (
  4BAE554E20EA9FC7007551B9 /* TealiumIOS.framework */,
- A94D9390CDE75BF51B4B7210 /* Pods_ConsentManagerDemo_ObjC.framework */,
+ 608A0BD3510355A136191D8F /* Pods_ConsentManagerDemo_ObjC.framework */,
  );
  name = Frameworks;
  sourceTree = "<group>";
  };
- FCCE0DD88AAEC79DF1F02FE8 /* Pods */ = {
+ A8491F919A337933A79E0C4D /* Pods */ = {
  isa = PBXGroup;
  children = (
- 773AF55DF20709642C6AEF70 /* Pods-ConsentManagerDemo_ObjC.debug.xcconfig */,
- BDDD39FF220E3678643D177B /* Pods-ConsentManagerDemo_ObjC.release.xcconfig */,
+ B7077D54415483B00774AC67 /* Pods-ConsentManagerDemo_ObjC.debug.xcconfig */,
+ 12481115152069B8FD46BB95 /* Pods-ConsentManagerDemo_ObjC.release.xcconfig */,
  );
  name = Pods;
+ path = Pods;
  sourceTree = "<group>";
  };
 /* End PBXGroup section */
@@ -133,11 +134,11 @@
  isa = PBXNativeTarget;
  buildConfigurationList = 4B2A117C20B8625200BCE2C6 /* Build configuration list for PBXNativeTarget "ConsentManagerDemo_ObjC" */;
  buildPhases = (
- 5273E7037EA3AEBD776C7D79 /* [CP] Check Pods Manifest.lock */,
+ 17C06D2604D254E6B5A1E12F /* [CP] Check Pods Manifest.lock */,
  4B2A116620B8625000BCE2C6 /* Sources */,
  4B2A116720B8625000BCE2C6 /* Frameworks */,
  4B2A116820B8625000BCE2C6 /* Resources */,
- 04CEC073E5E257150AFC2F2E /* [CP] Embed Pods Frameworks */,
+ 452A5D579197D6C703014D33 /* [CP] Embed Pods Frameworks */,
  );
  buildRules = (
  );
@@ -196,42 +197,43 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
- 04CEC073E5E257150AFC2F2E /* [CP] Embed Pods Frameworks */ = {
+ 17C06D2604D254E6B5A1E12F /* [CP] Check Pods Manifest.lock */ = {
  isa = PBXShellScriptBuildPhase;
  buildActionMask = 2147483647;
  files = (
  );
+ inputFileListPaths = (
+ );
  inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC-frameworks.sh",
- "${PODS_ROOT}/TealiumIOS/TealiumIOS.framework",
- "${PODS_ROOT}/TealiumIOS/TealiumIOS.framework.dSYM",
+ "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+ "${PODS_ROOT}/Manifest.lock",
+ );
+ name = "[CP] Check Pods Manifest.lock";
+ outputFileListPaths = (
  );
- name = "[CP] Embed Pods Frameworks";
  outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TealiumIOS.framework",
- "${DWARF_DSYM_FOLDER_PATH}/TealiumIOS.framework.dSYM",
+ "$(DERIVED_FILE_DIR)/Pods-ConsentManagerDemo_ObjC-checkManifestLockResult.txt",
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC-frameworks.sh\"\n";
+ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
  showEnvVarsInLog = 0;
  };
- 5273E7037EA3AEBD776C7D79 /* [CP] Check Pods Manifest.lock */ = {
+ 452A5D579197D6C703014D33 /* [CP] Embed Pods Frameworks */ = {
  isa = PBXShellScriptBuildPhase;
  buildActionMask = 2147483647;
  files = (
  );
- inputPaths = (
- "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
- "${PODS_ROOT}/Manifest.lock",
+ inputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC-frameworks-${CONFIGURATION}-input-files.xcfilelist",
  );
- name = "[CP] Check Pods Manifest.lock";
- outputPaths = (
- "$(DERIVED_FILE_DIR)/Pods-ConsentManagerDemo_ObjC-checkManifestLockResult.txt",
+ name = "[CP] Embed Pods Frameworks";
+ outputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC-frameworks-${CONFIGURATION}-output-files.xcfilelist",
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ConsentManagerDemo_ObjC/Pods-ConsentManagerDemo_ObjC-frameworks.sh\"\n";
  showEnvVarsInLog = 0;
  };
 /* End PBXShellScriptBuildPhase section */
@@ -392,7 +394,7 @@
  };
  4B2A117D20B8625200BCE2C6 /* Debug */ = {
  isa = XCBuildConfiguration;
- baseConfigurationReference = 773AF55DF20709642C6AEF70 /* Pods-ConsentManagerDemo_ObjC.debug.xcconfig */;
+ baseConfigurationReference = B7077D54415483B00774AC67 /* Pods-ConsentManagerDemo_ObjC.debug.xcconfig */;
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CODE_SIGN_STYLE = Automatic;
@@ -417,7 +419,7 @@
  };
  4B2A117E20B8625200BCE2C6 /* Release */ = {
  isa = XCBuildConfiguration;
- baseConfigurationReference = BDDD39FF220E3678643D177B /* Pods-ConsentManagerDemo_ObjC.release.xcconfig */;
+ baseConfigurationReference = 12481115152069B8FD46BB95 /* Pods-ConsentManagerDemo_ObjC.release.xcconfig */;
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CODE_SIGN_STYLE = Automatic;

diff --git a/Samples/ConsentManagerDemo_ObjC/Podfile b/Samples/ConsentManagerDemo_ObjC/Podfile
@@ -6,5 +6,5 @@ target 'ConsentManagerDemo_ObjC' do
  use_frameworks!
 
  # Pods for ConsentManagerDemo_ObjC
- pod "TealiumIOS"
+ pod "TealiumIOS", "~> 5.6.3"
 end
diff --git a/Samples/ConsentManagerDemo_ObjC/Podfile.lock b/Samples/ConsentManagerDemo_ObjC/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
- - TealiumIOS (5.5.1)
+ - TealiumIOS (5.6.3)
 
 DEPENDENCIES:
- - TealiumIOS
+ - TealiumIOS (~> 5.6.3)
 
 SPEC REPOS:
- https://github.com/cocoapods/specs.git:
+ trunk:
  - TealiumIOS
 
 SPEC CHECKSUMS:
- TealiumIOS: 796d6be605c0716ad49519b889e92ff8c49970e1
+ TealiumIOS: bcd40c7610ca09cc801814a77492e2771bad8d4d
 
-PODFILE CHECKSUM: 47a3aaee1896ab53985e76ad6f48100a2a76d64f
+PODFILE CHECKSUM: 09f4c01ec60e04b352b7ba4065bc99e0c24b22fe
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.8.3
diff --git a/Samples/ConsentManagerDemo_Swift/ConsentManagerDemo_Swift.xcodeproj/project.pbxproj b/Samples/ConsentManagerDemo_Swift/ConsentManagerDemo_Swift.xcodeproj/project.pbxproj
@@ -231,15 +231,12 @@
  buildActionMask = 2147483647;
  files = (
  );
- inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-ConsentManagerDemo_Swift/Pods-ConsentManagerDemo_Swift-frameworks.sh",
- "${PODS_ROOT}/TealiumIOS/TealiumIOS.framework",
- "${PODS_ROOT}/TealiumIOS/TealiumIOS.framework.dSYM",
+ inputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-ConsentManagerDemo_Swift/Pods-ConsentManagerDemo_Swift-frameworks-${CONFIGURATION}-input-files.xcfilelist",
  );
  name = "[CP] Embed Pods Frameworks";
- outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TealiumIOS.framework",
- "${DWARF_DSYM_FOLDER_PATH}/TealiumIOS.framework.dSYM",
+ outputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-ConsentManagerDemo_Swift/Pods-ConsentManagerDemo_Swift-frameworks-${CONFIGURATION}-output-files.xcfilelist",
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;

diff --git a/Samples/ConsentManagerDemo_Swift/Podfile b/Samples/ConsentManagerDemo_Swift/Podfile
@@ -6,5 +6,5 @@ target 'ConsentManagerDemo_Swift' do
  use_frameworks!
 
  # Pods for ConsentManagerDemo_Swift
- pod "TealiumIOS"
+ pod "TealiumIOS", "~> 5.6.3"
 end
diff --git a/Samples/ConsentManagerDemo_Swift/Podfile.lock b/Samples/ConsentManagerDemo_Swift/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
- - TealiumIOS (5.5.1)
+ - TealiumIOS (5.6.3)
 
 DEPENDENCIES:
- - TealiumIOS
+ - TealiumIOS (~> 5.6.3)
 
 SPEC REPOS:
- https://github.com/cocoapods/specs.git:
+ trunk:
  - TealiumIOS
 
 SPEC CHECKSUMS:
- TealiumIOS: 796d6be605c0716ad49519b889e92ff8c49970e1
+ TealiumIOS: bcd40c7610ca09cc801814a77492e2771bad8d4d
 
-PODFILE CHECKSUM: 0413d3ce927ae93a84240839e547e625c81fe8f3
+PODFILE CHECKSUM: 215d9c61de18c51c123cefe31ec79e81d1ecdf2e
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.8.3
diff --git a/Samples/RemoteCommandSurvey/Podfile b/Samples/RemoteCommandSurvey/Podfile
@@ -6,5 +6,5 @@ target 'RemoteCommandSurvey' do
  use_frameworks!
 
  # Pods for RemoteCommandSurvey
- pod "TealiumIOS"
+ pod "TealiumIOS", "~> 5.6.3"
 end
diff --git a/Samples/RemoteCommandSurvey/Podfile.lock b/Samples/RemoteCommandSurvey/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
- - TealiumIOS (5.5.1)
+ - TealiumIOS (5.6.3)
 
 DEPENDENCIES:
- - TealiumIOS
+ - TealiumIOS (~> 5.6.3)
 
 SPEC REPOS:
- https://github.com/cocoapods/specs.git:
+ trunk:
  - TealiumIOS
 
 SPEC CHECKSUMS:
- TealiumIOS: 796d6be605c0716ad49519b889e92ff8c49970e1
+ TealiumIOS: bcd40c7610ca09cc801814a77492e2771bad8d4d
 
-PODFILE CHECKSUM: 5e6b0a5217a8be7c77ba47ba559dacb94fd8dbce
+PODFILE CHECKSUM: 51b6ebb270a57cfe77caffde8863d03f0da92711
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.8.3
diff --git a/Samples/RemoteCommandSurvey/RemoteCommandSurvey.xcodeproj/project.pbxproj b/Samples/RemoteCommandSurvey/RemoteCommandSurvey.xcodeproj/project.pbxproj
@@ -166,18 +166,11 @@
  files = (
  );
  inputFileListPaths = (
- );
- inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-RemoteCommandSurvey/Pods-RemoteCommandSurvey-frameworks.sh",
- "${PODS_ROOT}/TealiumIOS/TealiumIOS.framework",
- "${PODS_ROOT}/TealiumIOS/TealiumIOS.framework.dSYM",
+ "${PODS_ROOT}/Target Support Files/Pods-RemoteCommandSurvey/Pods-RemoteCommandSurvey-frameworks-${CONFIGURATION}-input-files.xcfilelist",
  );
  name = "[CP] Embed Pods Frameworks";
  outputFileListPaths = (
- );
- outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TealiumIOS.framework",
- "${DWARF_DSYM_FOLDER_PATH}/TealiumIOS.framework.dSYM",
+ "${PODS_ROOT}/Target Support Files/Pods-RemoteCommandSurvey/Pods-RemoteCommandSurvey-frameworks-${CONFIGURATION}-output-files.xcfilelist",
  );
  runOnlyForDeploymentPostprocessing = 0;
  shellPath = /bin/sh;

diff --git a/Samples/WatchOS_Sample_Swift/Podfile b/Samples/WatchOS_Sample_Swift/Podfile
@@ -6,7 +6,7 @@ target 'WatchOS_Sample_Swift' do
  use_frameworks!
 
  # Pods for WatchOS_Sample_Swift
- pod "TealiumIOS"
+ pod "TealiumIOS", "~> 5.6.3"
 
 end
 
diff --git a/Samples/WatchOS_Sample_Swift/Podfile.lock b/Samples/WatchOS_Sample_Swift/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
- - TealiumIOS (5.4.4)
+ - TealiumIOS (5.6.3)
 
 DEPENDENCIES:
- - TealiumIOS
+ - TealiumIOS (~> 5.6.3)
 
 SPEC REPOS:
- https://github.com/cocoapods/specs.git:
+ trunk:
  - TealiumIOS
 
 SPEC CHECKSUMS:
- TealiumIOS: 12e0cd6396f8e09d79555c8bb24da0dc8abd09c6
+ TealiumIOS: bcd40c7610ca09cc801814a77492e2771bad8d4d
 
-PODFILE CHECKSUM: d086ace0cf2febe2925e99e8d01d0111c07c6d46
+PODFILE CHECKSUM: 36c39d42c9b8b492e2be51b42a900ba965ed82e0
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.8.3