diff --git a/.gitignore b/.gitignore index 8526439..50a2812 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,5 @@ xcuserdata # End of https://www.gitignore.io/api/xcode,swift,carthage,cocoapods,swiftpackagemanager +*.xcframework +*.xcframework.zip \ No newline at end of file diff --git a/Cartfile b/Cartfile index 5e6e59d..b992fef 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "https://github.com/facebook/facebook-ios-sdk" ~> 12.2 -github "https://github.com/tealium/tealium-swift" ~> 2.9 +github "https://github.com/tealium/tealium-swift" ~> 2.12 diff --git a/Package.swift b/Package.swift index c10fced..d69b543 100644 --- a/Package.swift +++ b/Package.swift @@ -4,13 +4,13 @@ import PackageDescription let package = Package( name: "TealiumFacebook", platforms: [ - .iOS(.v10) + .iOS(.v12) ], products: [ .library(name: "TealiumFacebook", targets: ["TealiumFacebook"]) ], dependencies: [ - .package(url: "https://github.com/tealium/tealium-swift", .upToNextMajor(from: "2.9.0")), + .package(url: "https://github.com/tealium/tealium-swift", .upToNextMajor(from: "2.12.0")), .package(url: "https://github.com/facebook/facebook-ios-sdk", .upToNextMajor(from: "12.2.0")) ], targets: [ diff --git a/SM/Surfile b/SM/Surfile new file mode 100644 index 0000000..05d1357 --- /dev/null +++ b/SM/Surfile @@ -0,0 +1,38 @@ + + + + + output_path + tealium-xcframeworks + frameworks + + + name + TealiumFacebook + targets + + + sdk + iOS + project + TealiumFacebook.xcodeproj + scheme + TealiumFacebook + + + sdk + iOSSimulator + project + TealiumFacebook.xcodeproj + scheme + TealiumFacebook + + + + + finalActions + + openDirectory + + + \ No newline at end of file diff --git a/Sources/FacebookConstants.swift b/Sources/FacebookConstants.swift index 78f5538..0514444 100644 --- a/Sources/FacebookConstants.swift +++ b/Sources/FacebookConstants.swift @@ -11,7 +11,7 @@ import FBSDKCoreKit /// All keys associated with Facebook remote command enum FacebookConstants { - static let version = "1.3.0" + static let version = "1.4.0" static let commandId = "facebook" static let description = "Facebook Remote Command" static let commandName = "command_name" diff --git a/TealiumFacebook.podspec b/TealiumFacebook.podspec index f101fea..69f47ad 100644 --- a/TealiumFacebook.podspec +++ b/TealiumFacebook.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.name = "TealiumFacebook" s.module_name = "TealiumFacebook" - s.version = "1.3.0" + s.version = "1.4.0" s.summary = "Tealium Swift and Facebook integration" s.description = <<-DESC Tealium's integration with Facebook for iOS. @@ -20,7 +20,7 @@ Pod::Spec.new do |s| # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.swift_version = "5.2" - s.platform = :ios, "11.0" + s.platform = :ios, "12.0" # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # s.source = { :git => "https://github.com/Tealium/tealium-ios-facebook-remote-command.git", :tag => "#{s.version}" } @@ -29,8 +29,8 @@ Pod::Spec.new do |s| s.ios.source_files = "Sources/*.{swift}" # ――― Dependencies ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # - s.ios.dependency 'tealium-swift/Core', ' ~> 2.9' - s.ios.dependency 'tealium-swift/RemoteCommands', ' ~> 2.9' + s.ios.dependency 'tealium-swift/Core', ' ~> 2.12' + s.ios.dependency 'tealium-swift/RemoteCommands', ' ~> 2.12' s.ios.dependency 'FBSDKCoreKit', ' ~> 12.2' end diff --git a/TealiumFacebook.xcodeproj/project.pbxproj b/TealiumFacebook.xcodeproj/project.pbxproj index 01b994c..a6222c0 100644 --- a/TealiumFacebook.xcodeproj/project.pbxproj +++ b/TealiumFacebook.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -437,7 +437,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Support/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -469,7 +469,7 @@ FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Support/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -496,6 +496,7 @@ "$(PROJECT_DIR)/Carthage/Build", ); INFOPLIST_FILE = Tests/Support/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -519,6 +520,7 @@ "$(PROJECT_DIR)/Carthage/Build", ); INFOPLIST_FILE = Tests/Support/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/TealiumFacebookExample/Podfile b/TealiumFacebookExample/Podfile index 4512057..80e97c2 100644 --- a/TealiumFacebookExample/Podfile +++ b/TealiumFacebookExample/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -#platform :ios, '9.0' +platform :ios, '12.0' target 'TealiumFacebookExample' do # Comment the next line if you don't want to use dynamic frameworks diff --git a/TealiumFacebookExample/Podfile.lock b/TealiumFacebookExample/Podfile.lock index c3196be..1f8d7a4 100644 --- a/TealiumFacebookExample/Podfile.lock +++ b/TealiumFacebookExample/Podfile.lock @@ -5,17 +5,17 @@ PODS: - FBAEMKit (= 12.2.1) - FBSDKCoreKit_Basics (= 12.2.1) - FBSDKCoreKit_Basics (12.2.1) - - tealium-swift/Core (2.9.1) - - tealium-swift/Lifecycle (2.9.1): + - tealium-swift/Core (2.12.2) + - tealium-swift/Lifecycle (2.12.2): - tealium-swift/Core - - tealium-swift/RemoteCommands (2.9.1): + - tealium-swift/RemoteCommands (2.12.2): - tealium-swift/Core - - tealium-swift/TagManagement (2.9.1): + - tealium-swift/TagManagement (2.12.2): - tealium-swift/Core - - TealiumFacebook (1.3.0): + - TealiumFacebook (1.4.0): - FBSDKCoreKit (~> 12.2) - - tealium-swift/Core (~> 2.9) - - tealium-swift/RemoteCommands (~> 2.9) + - tealium-swift/Core (~> 2.12) + - tealium-swift/RemoteCommands (~> 2.12) DEPENDENCIES: - tealium-swift/Lifecycle @@ -37,9 +37,9 @@ SPEC CHECKSUMS: FBAEMKit: 4cea610d0bc1680572f2aad7b25db7a2f2690d82 FBSDKCoreKit: 5b1992fe65802ca26be7e68bc4fac5f59fa39908 FBSDKCoreKit_Basics: a6a92ca628e05f86f458a4721574c5ddfb058ba3 - tealium-swift: 137769254e97d4c9f7ed6e16e0768b40888e6452 - TealiumFacebook: d9baef826faedcfc8da041619e7c36c09eb75ced + tealium-swift: 4b7e3dda42d7c1de6acb769abad9920346d17d43 + TealiumFacebook: 9caa67a521c80f939924a78e449f5d177cda12cf -PODFILE CHECKSUM: 269f2a495ec27c79a71c89f3842a044306345277 +PODFILE CHECKSUM: 73c4a5a6c67d9e4aec6d91b5923b0f6e296b6c79 -COCOAPODS: 1.11.3 +COCOAPODS: 1.15.2 diff --git a/TealiumFacebookExample/TealiumFacebookExample.xcodeproj/xcshareddata/xcschemes/TealiumFacebookExample.xcscheme b/TealiumFacebookExample/TealiumFacebookExample.xcodeproj/xcshareddata/xcschemes/TealiumFacebookExample.xcscheme new file mode 100644 index 0000000..58f8684 --- /dev/null +++ b/TealiumFacebookExample/TealiumFacebookExample.xcodeproj/xcshareddata/xcschemes/TealiumFacebookExample.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/publish.sh b/publish.sh new file mode 100644 index 0000000..84c770a --- /dev/null +++ b/publish.sh @@ -0,0 +1,65 @@ +# 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=$(