Merge pull request #105 from Giphy/task/make-it-run-on-tvos

Compile for tvOS
Giphy · Jan 28, 2020 · 3144c3a · 3144c3a
2 parents 083b55f + c2e9aa6
commit 3144c3a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/GiphyCoreSDK.xcodeproj/project.pbxproj b/GiphyCoreSDK.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2335561823DF741500DDC899 /* OMSDK_Giphy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD473ED0234B988800843E7D /* OMSDK_Giphy.framework */; };
 		239D4005228F45D0004D4B64 /* GPHMedia+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 239D4004228F45D0004D4B64 /* GPHMedia+Additions.swift */; };
 		AF05A7A31F66DB940095F5BA /* GPHChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF05A7A21F66DB940095F5BA /* GPHChannel.swift */; };
 		AF05A7A51F66E1560095F5BA /* GPHChannelResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF05A7A41F66E1560095F5BA /* GPHChannelResponse.swift */; };
@@ -405,6 +406,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				2335561823DF741500DDC899 /* OMSDK_Giphy.framework in Frameworks */,
 				FDAA1ACB2200FBF7009D34F4 /* GiphyPingbackSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1282,6 +1284,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)-auth/Carthage/Build/tvOS",
 					"$(PROJECT_DIR)/Carthage/Build/tvOS/Static",
+					"$(PROJECT_DIR)/omsdk-ios-1.2.20-Giphy",
 				);
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1313,6 +1316,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)-auth/Carthage/Build/tvOS",
 					"$(PROJECT_DIR)/Carthage/Build/tvOS/Static",
+					"$(PROJECT_DIR)/omsdk-ios-1.2.20-Giphy",
 				);
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1377,6 +1381,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac/Static",
+					"$(PROJECT_DIR)/omsdk-ios-1.2.20-Giphy",
 				);
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Sources/Info.plist;
@@ -1408,6 +1413,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/Mac/Static",
+					"$(PROJECT_DIR)/omsdk-ios-1.2.20-Giphy",
 				);
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Sources/Info.plist;

diff --git a/Sources/GPHListMediaResponse.swift b/Sources/GPHListMediaResponse.swift
@@ -78,7 +78,7 @@ extension GPHListMediaResponse: GPHMappable {
             results = []
             for result in mediaData {
                 let result = try GPHMedia.mapData(result, options: options)
-                #if os(iOS)
+                #if os(iOS) || os(tvOS)
                 result.responseId = meta.responseId
                 #endif
                 if result.isValidObject() {

diff --git a/Sources/GPHMedia+Pingbacks.swift b/Sources/GPHMedia+Pingbacks.swift
@@ -5,7 +5,7 @@
 //  Created by Cem Kozinoglu on 3/13/18.
 //  Copyright © 2018 Giphy. All rights reserved.
 //
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 
 import Foundation
 

diff --git a/Sources/GPHMedia.swift b/Sources/GPHMedia.swift
@@ -9,7 +9,7 @@
 //  License, v. 2.0. If a copy of the MPL was not distributed with this
 //  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-#if os(iOS)  
+#if os(iOS) || os(tvOS)
 import OMSDK_Giphy
 #endif
 
@@ -322,7 +322,7 @@ extension GPHMedia: GPHMappable {
             obj.bottleData = try GPHBottleData.mapData(bottleData, options: optionsCopy)
         } 
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
 
         // Store the request type in the GPHMedia so we can include in Pingbacks data
         switch requestType {

diff --git a/Sources/GPHMediaResponse.swift b/Sources/GPHMediaResponse.swift
@@ -70,7 +70,7 @@ extension GPHMediaResponse: GPHMappable {
             let data = try GPHMedia.mapData(mediaData, options: options)
 
             // Store the response ID in the GPHMedia so we can include in Pingbacks data
-            #if os(iOS)
+            #if os(iOS) || os(tvOS)
             data.responseId = meta.responseId
             #endif
             if data.isValidObject() {

diff --git a/Sources/GPHRequest.swift b/Sources/GPHRequest.swift
@@ -344,7 +344,7 @@ public enum GPHRequestRouter {
         }
 
         // Propagate the headers to Pingbacks
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
         GiphyPingbacks.addAdditionalHeaders(parameters: request.allHTTPHeaderFields)
         #endif
 

diff --git a/Sources/GiphyCore.swift b/Sources/GiphyCore.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2018 Giphy. All rights reserved.
 //
 
-#if os(iOS)   
+#if os(iOS) || os(tvOS)
 import OMSDK_Giphy
 #endif
 
@@ -38,10 +38,12 @@ import Foundation
         shared.apiKey = apiKey
         GiphyCore.enableLogs = (Bundle.main.object(forInfoDictionaryKey: "GiphyEnableLogs") as? Bool) ?? false
 
-        #if os(iOS)
+        #if os(iOS) || os(tvOS)
         GiphyPingbacks.configure(apiKey: apiKey, verificationMode: verificationMode)
         GiphyPingbacks.enableDebugLogging(GiphyCore.enableLogs)
+        #endif
 
+        #if os(iOS)
         GiphyCore.enableOM = !isAppExtension
         if let omVal = Bundle.main.object(forInfoDictionaryKey: "GiphyDisableOpenMeasurement") as? Bool, omVal == true {
             GiphyCore.enableOM = false

diff --git a/Sources/GiphyTracking.swift b/Sources/GiphyTracking.swift
@@ -1,4 +1,4 @@
-#if os(iOS)
+#if os(iOS) || os(tvOS)
 import OMSDK_Giphy
 import UIKit