diff --git a/Example/PrebidDemo/PrebidDemo.xcodeproj/project.pbxproj b/Example/PrebidDemo/PrebidDemo.xcodeproj/project.pbxproj index 4adc6795a..e40e307ce 100644 --- a/Example/PrebidDemo/PrebidDemo.xcodeproj/project.pbxproj +++ b/Example/PrebidDemo/PrebidDemo.xcodeproj/project.pbxproj @@ -161,8 +161,8 @@ FA12E452231E9C5900CAA05B = { isa = PBXGroup; children = ( - FA12E514231EBFED00CAA05B /* common */, FA12E472231E9DAA00CAA05B /* PrebidMobile.xcodeproj */, + FA12E514231EBFED00CAA05B /* common */, FA12E4B5231EB04100CAA05B /* PrebidDemoSwift */, FA12E4F7231EB99D00CAA05B /* PrebidDemoObjectiveC */, FA12E4E7231EB52D00CAA05B /* PrebidDemoSwiftTests */, diff --git a/Example/PrebidDemo/PrebidDemo.xcodeproj/xcshareddata/xcschemes/PrebidDemoObjectiveC.xcscheme b/Example/PrebidDemo/PrebidDemo.xcodeproj/xcshareddata/xcschemes/PrebidDemoObjectiveC.xcscheme new file mode 100644 index 000000000..13a06ec43 --- /dev/null +++ b/Example/PrebidDemo/PrebidDemo.xcodeproj/xcshareddata/xcschemes/PrebidDemoObjectiveC.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Podfile b/Podfile index 7a3a014bb..77efbf385 100644 --- a/Podfile +++ b/Podfile @@ -4,6 +4,7 @@ platform :ios, '9.0' workspace 'PrebidMobile' project 'PrebidMobile.xcodeproj' project 'Example/PrebidDemo/PrebidDemo.xcodeproj' +project 'tools/PrebidValidator/Dr.Prebid.xcodeproj' def prebid_demo_pods use_frameworks! @@ -13,18 +14,15 @@ def prebid_demo_pods end target 'PrebidMobile' do - - project 'Example/PrebidDemo/PrebidDemo.xcodeproj' - - # Comment the next line if you're not using Swift and don't want to use dynamic frameworks - use_frameworks! - project 'PrebidMobile.xcodeproj' + use_frameworks! + end target 'PrebidDemoSwift' do - + project 'Example/PrebidDemo/PrebidDemo.xcodeproj' + prebid_demo_pods target 'PrebidDemoSwiftTests' do @@ -33,6 +31,13 @@ target 'PrebidDemoSwift' do end target 'PrebidDemoObjectiveC' do + project 'Example/PrebidDemo/PrebidDemo.xcodeproj' + + prebid_demo_pods +end + +target 'Dr.Prebid' do + project 'tools/PrebidValidator/Dr.Prebid.xcodeproj' prebid_demo_pods end diff --git a/Podfile.lock b/Podfile.lock index d36a32ad3..8839cfa4a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -45,7 +45,7 @@ DEPENDENCIES: - mopub-ios-sdk SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - Google-Mobile-Ads-SDK - GoogleAppMeasurement - GoogleUtilities @@ -59,6 +59,6 @@ SPEC CHECKSUMS: mopub-ios-sdk: b63e15803e70b92d0b51c3e1c49bbcd78cd3d1d5 nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 -PODFILE CHECKSUM: 9761125f1dc32d2bf69f14c64dc86d3776e8cb3b +PODFILE CHECKSUM: c1faddac5c8c576b3969e3521fb4624984707663 -COCOAPODS: 1.7.5 +COCOAPODS: 1.8.0.beta.2 diff --git a/PrebidMobile.xcodeproj/project.pbxproj b/PrebidMobile.xcodeproj/project.pbxproj index b1cb0c344..df1e9a8f1 100644 --- a/PrebidMobile.xcodeproj/project.pbxproj +++ b/PrebidMobile.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 04E6CDFF74F753C58109307F /* Pods_PrebidMobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7254DC61ED228E25F4E59934 /* Pods_PrebidMobile.framework */; }; + 31CA7837FAAF3233361E2175 /* Pods_PrebidMobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0626C304B3A5194ADE92449D /* Pods_PrebidMobile.framework */; }; 600072FF21BAFD2F00F4738B /* Dispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 600072FE21BAFD2F00F4738B /* Dispatcher.swift */; }; 600CF0702208963500C95176 /* UtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 600CF06F2208963500C95176 /* UtilsTests.swift */; }; 600CF13E220CDFA700C95176 /* responseinvalidSize.json in Resources */ = {isa = PBXBuildFile; fileRef = 600CF13D220CDFA700C95176 /* responseinvalidSize.json */; }; @@ -83,6 +83,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0626C304B3A5194ADE92449D /* Pods_PrebidMobile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PrebidMobile.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 600072FE21BAFD2F00F4738B /* Dispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dispatcher.swift; sourceTree = ""; }; 600CF06F2208963500C95176 /* UtilsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UtilsTests.swift; sourceTree = ""; }; 600CF13D220CDFA700C95176 /* responseinvalidSize.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = responseinvalidSize.json; sourceTree = ""; }; @@ -116,9 +117,7 @@ 60D79315217E39D90080F428 /* Targeting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Targeting.swift; sourceTree = ""; }; 60D79317217F7F3E0080F428 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; 60EE7B0521F26329000B12A8 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; - 671406A161AE91E195CCA16D /* Pods-PrebidMobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PrebidMobile.debug.xcconfig"; path = "Target Support Files/Pods-PrebidMobile/Pods-PrebidMobile.debug.xcconfig"; sourceTree = ""; }; - 703BEDBFF02FE8F759F1FDFA /* Pods-PrebidMobile.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PrebidMobile.release.xcconfig"; path = "Target Support Files/Pods-PrebidMobile/Pods-PrebidMobile.release.xcconfig"; sourceTree = ""; }; - 7254DC61ED228E25F4E59934 /* Pods_PrebidMobile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PrebidMobile.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 92FD1B8FCB98EDF6844173A5 /* Pods-PrebidMobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PrebidMobile.debug.xcconfig"; path = "Target Support Files/Pods-PrebidMobile/Pods-PrebidMobile.debug.xcconfig"; sourceTree = ""; }; 9757A984220076CF00A3F8F8 /* InterstItialAdUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterstItialAdUnitTests.swift; sourceTree = ""; }; 97826A8621FB4514001E2C05 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 97826AA621FB4F1B001E2C05 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; @@ -145,6 +144,7 @@ 97EE4C6422035DD1006FEFA2 /* responseInvalidConfigId.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = responseInvalidConfigId.json; sourceTree = ""; }; 97EE4C6722035E57006FEFA2 /* responseIncorrectFormat.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = responseIncorrectFormat.json; sourceTree = ""; }; 97F29999220056D10072E0C0 /* BannerAdUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerAdUnitTests.swift; sourceTree = ""; }; + A6C43BFD0896916C59564567 /* Pods-PrebidMobile.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PrebidMobile.release.xcconfig"; path = "Target Support Files/Pods-PrebidMobile/Pods-PrebidMobile.release.xcconfig"; sourceTree = ""; }; F5400CB12209E8210018F6B1 /* responseInvalidResponseWithoutCacheId.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = responseInvalidResponseWithoutCacheId.json; sourceTree = ""; }; F5400CB52209EBF50018F6B1 /* PrebidServerValidResponseAppNexusNoCacheIdAndRunbiconHasCacheId.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = PrebidServerValidResponseAppNexusNoCacheIdAndRunbiconHasCacheId.json; sourceTree = ""; }; F5400CB72209F19B0018F6B1 /* responseInvalidNoTopCacheId.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = responseInvalidNoTopCacheId.json; sourceTree = ""; }; @@ -169,7 +169,7 @@ buildActionMask = 2147483647; files = ( 6062B19C218243FA00CE1BA3 /* CoreLocation.framework in Frameworks */, - 04E6CDFF74F753C58109307F /* Pods_PrebidMobile.framework in Frameworks */, + 31CA7837FAAF3233361E2175 /* Pods_PrebidMobile.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -188,7 +188,7 @@ isa = PBXGroup; children = ( 6062B19B218243FA00CE1BA3 /* CoreLocation.framework */, - 7254DC61ED228E25F4E59934 /* Pods_PrebidMobile.framework */, + 0626C304B3A5194ADE92449D /* Pods_PrebidMobile.framework */, ); name = Frameworks; sourceTree = ""; @@ -356,8 +356,8 @@ EE09B07119B6562CC4356195 /* Pods */ = { isa = PBXGroup; children = ( - 671406A161AE91E195CCA16D /* Pods-PrebidMobile.debug.xcconfig */, - 703BEDBFF02FE8F759F1FDFA /* Pods-PrebidMobile.release.xcconfig */, + 92FD1B8FCB98EDF6844173A5 /* Pods-PrebidMobile.debug.xcconfig */, + A6C43BFD0896916C59564567 /* Pods-PrebidMobile.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -406,7 +406,7 @@ isa = PBXNativeTarget; buildConfigurationList = 60D79306217E229B0080F428 /* Build configuration list for PBXNativeTarget "PrebidMobile" */; buildPhases = ( - CF3EFDA73C5AF04AC84FCC76 /* [CP] Check Pods Manifest.lock */, + 4DE02C41A582B3608C4A1DF9 /* [CP] Check Pods Manifest.lock */, 60D792ED217E229A0080F428 /* Sources */, 60D792EE217E229A0080F428 /* Frameworks */, 60D792EF217E229A0080F428 /* Headers */, @@ -511,7 +511,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - CF3EFDA73C5AF04AC84FCC76 /* [CP] Check Pods Manifest.lock */ = { + 4DE02C41A582B3608C4A1DF9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -726,7 +726,7 @@ }; 60D79307217E229B0080F428 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 671406A161AE91E195CCA16D /* Pods-PrebidMobile.debug.xcconfig */; + baseConfigurationReference = 92FD1B8FCB98EDF6844173A5 /* Pods-PrebidMobile.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; @@ -758,7 +758,7 @@ }; 60D79308217E229B0080F428 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 703BEDBFF02FE8F759F1FDFA /* Pods-PrebidMobile.release.xcconfig */; + baseConfigurationReference = A6C43BFD0896916C59564567 /* Pods-PrebidMobile.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; diff --git a/PrebidMobile.xcworkspace/contents.xcworkspacedata b/PrebidMobile.xcworkspace/contents.xcworkspacedata index 53e55baa4..bd62001d0 100644 --- a/PrebidMobile.xcworkspace/contents.xcworkspacedata +++ b/PrebidMobile.xcworkspace/contents.xcworkspacedata @@ -1,11 +1,14 @@ + + + location = "group:tools/PrebidValidator/Dr.Prebid.xcodeproj"> diff --git a/tools/PrebidValidator/Dr.Prebid.xcodeproj/project.pbxproj b/tools/PrebidValidator/Dr.Prebid.xcodeproj/project.pbxproj index 21e255a36..9d5828897 100644 --- a/tools/PrebidValidator/Dr.Prebid.xcodeproj/project.pbxproj +++ b/tools/PrebidValidator/Dr.Prebid.xcodeproj/project.pbxproj @@ -59,9 +59,8 @@ 60D124642126DBAD00EC6EE2 /* KVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 60D124632126DBAD00EC6EE2 /* KVViewController.m */; }; 60D124692126E1F300EC6EE2 /* CPMSectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 60D124672126E1F300EC6EE2 /* CPMSectionCell.m */; }; 60D1246A2126E1F300EC6EE2 /* CPMSectionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 60D124682126E1F300EC6EE2 /* CPMSectionCell.xib */; }; - 977043D4221AD69B00616AD8 /* PrebidMobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 977043CF221AD5CA00616AD8 /* PrebidMobile.framework */; }; + 7A557DBFCFAE372590F751D6 /* Pods_Dr_Prebid.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3E59CE17F9B673A68B9666D /* Pods_Dr_Prebid.framework */; }; D15C104F20F6EB32004CBC18 /* AdSizeController.m in Sources */ = {isa = PBXBuildFile; fileRef = D15C104E20F6EB32004CBC18 /* AdSizeController.m */; }; - F283A423484632D93AE6FB87 /* libPods-Dr.Prebid.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EF6536B68EE8867DF49CF0E /* libPods-Dr.Prebid.a */; }; F533B16821309548001977C2 /* AdServerResponseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F533B16721309548001977C2 /* AdServerResponseViewController.m */; }; F533B16E21349D09001977C2 /* ColorTool.m in Sources */ = {isa = PBXBuildFile; fileRef = F533B16D21349D09001977C2 /* ColorTool.m */; }; F533B1712134A361001977C2 /* AdServerValidationMockInterstitial.m in Sources */ = {isa = PBXBuildFile; fileRef = F533B1702134A361001977C2 /* AdServerValidationMockInterstitial.m */; }; @@ -84,23 +83,23 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 977043CE221AD5CA00616AD8 /* PBXContainerItemProxy */ = { + FA12E525231FD3BD00CAA05B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 977043C9221AD5CA00616AD8 /* PrebidMobile.xcodeproj */; + containerPortal = FA12E520231FD3BD00CAA05B /* PrebidMobile.xcodeproj */; proxyType = 2; remoteGlobalIDString = 60D792F2217E229A0080F428; remoteInfo = PrebidMobile; }; - 977043D0221AD5CA00616AD8 /* PBXContainerItemProxy */ = { + FA12E527231FD3BD00CAA05B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 977043C9221AD5CA00616AD8 /* PrebidMobile.xcodeproj */; + containerPortal = FA12E520231FD3BD00CAA05B /* PrebidMobile.xcodeproj */; proxyType = 2; remoteGlobalIDString = 60D792FB217E229B0080F428; remoteInfo = PrebidMobileTests; }; - 977043D2221AD69400616AD8 /* PBXContainerItemProxy */ = { + FA12E52B231FD77F00CAA05B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 977043C9221AD5CA00616AD8 /* PrebidMobile.xcodeproj */; + containerPortal = FA12E520231FD3BD00CAA05B /* PrebidMobile.xcodeproj */; proxyType = 1; remoteGlobalIDString = 60D792F1217E229A0080F428; remoteInfo = PrebidMobile; @@ -109,7 +108,7 @@ /* Begin PBXFileReference section */ 0D7DFE449C9FE5570D88DDD6 /* libPods-PrebidValidator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PrebidValidator.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4AB57692E142F2F12F162457 /* Pods-Dr.Prebid.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dr.Prebid.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid.debug.xcconfig"; sourceTree = ""; }; + 4AB57692E142F2F12F162457 /* Pods-Dr.Prebid.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dr.Prebid.debug.xcconfig"; path = "../../Pods/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid.debug.xcconfig"; sourceTree = ""; }; 600073C421DE65CA00F4738B /* CustomTextView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomTextView.h; sourceTree = ""; }; 600073C521DE65CA00F4738B /* CustomTextView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CustomTextView.m; sourceTree = ""; }; 6013E445221C605500FEE2B1 /* DemandRequestBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemandRequestBuilder.h; sourceTree = ""; }; @@ -194,8 +193,7 @@ 60D124662126E1F300EC6EE2 /* CPMSectionCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CPMSectionCell.h; sourceTree = ""; }; 60D124672126E1F300EC6EE2 /* CPMSectionCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CPMSectionCell.m; sourceTree = ""; }; 60D124682126E1F300EC6EE2 /* CPMSectionCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CPMSectionCell.xib; sourceTree = ""; }; - 8EF6536B68EE8867DF49CF0E /* libPods-Dr.Prebid.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Dr.Prebid.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 977043C9221AD5CA00616AD8 /* PrebidMobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PrebidMobile.xcodeproj; path = ../../../src/PrebidMobile/PrebidMobile.xcodeproj; sourceTree = ""; }; + A3E59CE17F9B673A68B9666D /* Pods_Dr_Prebid.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Dr_Prebid.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D15C104E20F6EB32004CBC18 /* AdSizeController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AdSizeController.m; sourceTree = ""; }; D15C105120F6EB4F004CBC18 /* AdSizeController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AdSizeController.h; sourceTree = ""; }; F533B1662130882E001977C2 /* AdServerValidationURLProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AdServerValidationURLProtocol.h; sourceTree = ""; }; @@ -229,7 +227,8 @@ F5D1856221011570001DF99A /* about.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = about.html; sourceTree = ""; }; F5D1856321011570001DF99A /* info-prebid-server.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "info-prebid-server.html"; sourceTree = ""; }; F5D1856421011571001DF99A /* info-general.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "info-general.html"; sourceTree = ""; }; - F6CF0D6B7635B4C963599C3F /* Pods-Dr.Prebid.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dr.Prebid.release.xcconfig"; path = "Pods/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid.release.xcconfig"; sourceTree = ""; }; + F6CF0D6B7635B4C963599C3F /* Pods-Dr.Prebid.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Dr.Prebid.release.xcconfig"; path = "../../Pods/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid.release.xcconfig"; sourceTree = ""; }; + FA12E520231FD3BD00CAA05B /* PrebidMobile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PrebidMobile.xcodeproj; path = ../../PrebidMobile.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -237,7 +236,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 977043D4221AD69B00616AD8 /* PrebidMobile.framework in Frameworks */, 60CFB2EA2097A4C4006FCF7C /* WebKit.framework in Frameworks */, 60CFB2EB2097A4C4006FCF7C /* StoreKit.framework in Frameworks */, 60CFB2EC2097A4C4006FCF7C /* SafariServices.framework in Frameworks */, @@ -253,7 +251,7 @@ 60CFB2DF2097A44C006FCF7C /* CoreMedia.framework in Frameworks */, 60CFB2E02097A44C006FCF7C /* AVFoundation.framework in Frameworks */, 605A56CB2076C89A00E92376 /* MessageUI.framework in Frameworks */, - F283A423484632D93AE6FB87 /* libPods-Dr.Prebid.a in Frameworks */, + 7A557DBFCFAE372590F751D6 /* Pods_Dr_Prebid.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -336,6 +334,7 @@ 60C678762073D7B0003A7A1D = { isa = PBXGroup; children = ( + FA12E520231FD3BD00CAA05B /* PrebidMobile.xcodeproj */, 60CFB2562097820D006FCF7C /* Dr.Prebid */, 60C678802073D7B0003A7A1D /* Products */, 60C678AC2073F879003A7A1D /* Frameworks */, @@ -370,7 +369,7 @@ 60CFB2DA2097A44B006FCF7C /* CoreMedia.framework */, 605A56CA2076C89A00E92376 /* MessageUI.framework */, 0D7DFE449C9FE5570D88DDD6 /* libPods-PrebidValidator.a */, - 8EF6536B68EE8867DF49CF0E /* libPods-Dr.Prebid.a */, + A3E59CE17F9B673A68B9666D /* Pods_Dr_Prebid.framework */, ); name = Frameworks; sourceTree = ""; @@ -378,7 +377,6 @@ 60CFB2562097820D006FCF7C /* Dr.Prebid */ = { isa = PBXGroup; children = ( - 977043C9221AD5CA00616AD8 /* PrebidMobile.xcodeproj */, F54C7F5821497F6C00025B23 /* Intro */, 60A2CC262121B65300EA6ACF /* TestSummary */, 609172E320F3E50F001B94A8 /* Settings */, @@ -456,15 +454,6 @@ path = AdServerValidation; sourceTree = ""; }; - 977043CA221AD5CA00616AD8 /* Products */ = { - isa = PBXGroup; - children = ( - 977043CF221AD5CA00616AD8 /* PrebidMobile.framework */, - 977043D1221AD5CA00616AD8 /* PrebidMobileTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; F54C7F5821497F6C00025B23 /* Intro */ = { isa = PBXGroup; children = ( @@ -501,6 +490,15 @@ path = HelpPagesAssets; sourceTree = ""; }; + FA12E521231FD3BD00CAA05B /* Products */ = { + isa = PBXGroup; + children = ( + FA12E526231FD3BD00CAA05B /* PrebidMobile.framework */, + FA12E528231FD3BD00CAA05B /* PrebidMobileTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -512,12 +510,12 @@ 60C6787B2073D7B0003A7A1D /* Sources */, 60C6787C2073D7B0003A7A1D /* Frameworks */, 60C6787D2073D7B0003A7A1D /* Resources */, - E624586C77DB04668970D12A /* [CP] Copy Pods Resources */, + 63FA11DD5B01A66CFDB5C640 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( - 977043D3221AD69400616AD8 /* PBXTargetDependency */, + FA12E52C231FD77F00CAA05B /* PBXTargetDependency */, ); name = Dr.Prebid; productName = PrebidTestApp; @@ -552,8 +550,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 977043CA221AD5CA00616AD8 /* Products */; - ProjectRef = 977043C9221AD5CA00616AD8 /* PrebidMobile.xcodeproj */; + ProductGroup = FA12E521231FD3BD00CAA05B /* Products */; + ProjectRef = FA12E520231FD3BD00CAA05B /* PrebidMobile.xcodeproj */; }, ); projectRoot = ""; @@ -564,18 +562,18 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 977043CF221AD5CA00616AD8 /* PrebidMobile.framework */ = { + FA12E526231FD3BD00CAA05B /* PrebidMobile.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; path = PrebidMobile.framework; - remoteRef = 977043CE221AD5CA00616AD8 /* PBXContainerItemProxy */; + remoteRef = FA12E525231FD3BD00CAA05B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 977043D1221AD5CA00616AD8 /* PrebidMobileTests.xctest */ = { + FA12E528231FD3BD00CAA05B /* PrebidMobileTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; path = PrebidMobileTests.xctest; - remoteRef = 977043D0221AD5CA00616AD8 /* PBXContainerItemProxy */; + remoteRef = FA12E527231FD3BD00CAA05B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -623,64 +621,26 @@ 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; }; - E624586C77DB04668970D12A /* [CP] Copy Pods Resources */ = { + 63FA11DD5B01A66CFDB5C640 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid-resources.sh", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Internal/Common/MPAdBrowserController.xib", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPCloseBtn.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPCloseBtn@2x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPCloseBtn@3x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPCloseButtonX.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPCloseButtonX@2x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPCloseButtonX@3x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPCountdownTimer.html", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPDAAIcon.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPDAAIcon@2x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPDAAIcon@3x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPMutedBtn.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPMutedBtn@2x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPMutedBtn@3x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPPlayBtn.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPPlayBtn@2x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPPlayBtn@3x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPUnmutedBtn.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPUnmutedBtn@2x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPUnmutedBtn@3x.png", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MRAID.bundle", - "${PODS_ROOT}/mopub-ios-sdk/MoPubSDK/Resources/MPAdapters.plist", - ); - name = "[CP] Copy Pods Resources"; + "${PODS_ROOT}/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", + "${BUILT_PRODUCTS_DIR}/mopub-ios-sdk/MoPub.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + ); + name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPAdBrowserController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCountdownTimer.html", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPMutedBtn@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPPlayBtn@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn@2x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPUnmutedBtn@3x.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MRAID.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPAdapters.plist", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MoPub.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -739,10 +699,10 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 977043D3221AD69400616AD8 /* PBXTargetDependency */ = { + FA12E52C231FD77F00CAA05B /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = PrebidMobile; - targetProxy = 977043D2221AD69400616AD8 /* PBXContainerItemProxy */; + targetProxy = FA12E52B231FD77F00CAA05B /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ diff --git a/tools/PrebidValidator/Dr.Prebid.xcworkspace/contents.xcworkspacedata b/tools/PrebidValidator/Dr.Prebid.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index cd68ababe..000000000 --- a/tools/PrebidValidator/Dr.Prebid.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/tools/PrebidValidator/Dr.Prebid.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tools/PrebidValidator/Dr.Prebid.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/tools/PrebidValidator/Dr.Prebid.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/tools/PrebidValidator/Dr.Prebid/Info.plist b/tools/PrebidValidator/Dr.Prebid/Info.plist index 81b4bd5dc..ed8918dbd 100644 --- a/tools/PrebidValidator/Dr.Prebid/Info.plist +++ b/tools/PrebidValidator/Dr.Prebid/Info.plist @@ -58,5 +58,7 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + GADIsAdManagerApp + diff --git a/tools/PrebidValidator/Podfile b/tools/PrebidValidator/Podfile deleted file mode 100644 index 1c6a182c9..000000000 --- a/tools/PrebidValidator/Podfile +++ /dev/null @@ -1,8 +0,0 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' - -target 'Dr.Prebid' do - pod 'mopub-ios-sdk' - pod 'Google-Mobile-Ads-SDK' -end - diff --git a/tools/PrebidValidator/Podfile.lock b/tools/PrebidValidator/Podfile.lock deleted file mode 100644 index 758200b14..000000000 --- a/tools/PrebidValidator/Podfile.lock +++ /dev/null @@ -1,30 +0,0 @@ -PODS: - - Google-Mobile-Ads-SDK (7.39.0) - - mopub-ios-sdk (5.5.0): - - mopub-ios-sdk/MoPubSDK (= 5.5.0) - - mopub-ios-sdk/Avid (5.5.0): - - mopub-ios-sdk/Core - - mopub-ios-sdk/Core (5.5.0) - - mopub-ios-sdk/Moat (5.5.0): - - mopub-ios-sdk/Core - - mopub-ios-sdk/MoPubSDK (5.5.0): - - mopub-ios-sdk/Avid - - mopub-ios-sdk/Core - - mopub-ios-sdk/Moat - -DEPENDENCIES: - - Google-Mobile-Ads-SDK - - mopub-ios-sdk - -SPEC REPOS: - https://github.com/cocoapods/specs.git: - - Google-Mobile-Ads-SDK - - mopub-ios-sdk - -SPEC CHECKSUMS: - Google-Mobile-Ads-SDK: d0f10a7c4d7015db23075ff316602350d12049db - mopub-ios-sdk: 937b82dd76d8a396ba6a22ae005a1e24c61bf28b - -PODFILE CHECKSUM: 4a73acef4af6b9dc201a267b3260271a1b4d65b8 - -COCOAPODS: 1.5.3