From e3e763c08d6879d6c002c8031f3d5baffd8abb26 Mon Sep 17 00:00:00 2001 From: John Tran Date: Mon, 16 Nov 2020 19:13:53 -0800 Subject: [PATCH] fix: SPM macOS/tvOS disable event explorer (#315) * Reorganize folder structure to reflect XCode structure and SPM requirements * Adjust podspec for new project structure * Update .gitignore * update cocoapods --- .gitignore | 26 ++- Amplitude.podspec | 14 +- Amplitude.xcodeproj/project.pbxproj | 179 +++++++++--------- Gemfile | 2 +- Gemfile.lock | 2 +- Package.swift | 41 ++-- Podfile.lock | 2 +- .../{ => SSLPinning}/ISPCertificatePinning.h | 0 .../{ => SSLPinning}/ISPCertificatePinning.m | 0 .../ISPPinnedNSURLConnectionDelegate.h | 0 .../ISPPinnedNSURLConnectionDelegate.m | 0 .../ISPPinnedNSURLSessionDelegate.h | 0 .../ISPPinnedNSURLSessionDelegate.m | 0 .../AMPBubbleView.h | 0 .../AMPBubbleView.m | 0 .../AMPEventExplorer.h | 0 .../AMPEventExplorer.m | 0 .../AMPInfoViewController.h | 0 .../AMPInfoViewController.m | 0 .../Resources/AMPBubbleView.xib | 0 .../Resources/AMPInfoViewController.xib | 0 .../Resources/Images}/cancel.png | Bin .../Resources/Images}/cancel@2x.png | Bin .../Resources/Images}/cancel@3x.png | Bin .../Resources/Images}/logo-banner.png | Bin .../Resources/Images}/logo-banner@2x.png | Bin .../Resources/Images}/logo-banner@3x.png | Bin .../Resources/Images}/logo-button.png | Bin .../Resources/Images}/logo-button@2x.png | Bin .../Resources/Images}/logo-button@3x.png | Bin 30 files changed, 145 insertions(+), 121 deletions(-) rename Sources/Amplitude/{ => SSLPinning}/ISPCertificatePinning.h (100%) rename Sources/Amplitude/{ => SSLPinning}/ISPCertificatePinning.m (100%) rename Sources/Amplitude/{ => SSLPinning}/ISPPinnedNSURLConnectionDelegate.h (100%) rename Sources/Amplitude/{ => SSLPinning}/ISPPinnedNSURLConnectionDelegate.m (100%) rename Sources/Amplitude/{ => SSLPinning}/ISPPinnedNSURLSessionDelegate.h (100%) rename Sources/Amplitude/{ => SSLPinning}/ISPPinnedNSURLSessionDelegate.m (100%) rename Sources/{Amplitude => EventExplorer}/AMPBubbleView.h (100%) rename Sources/{Amplitude => EventExplorer}/AMPBubbleView.m (100%) rename Sources/{Amplitude => EventExplorer}/AMPEventExplorer.h (100%) rename Sources/{Amplitude => EventExplorer}/AMPEventExplorer.m (100%) rename Sources/{Amplitude => EventExplorer}/AMPInfoViewController.h (100%) rename Sources/{Amplitude => EventExplorer}/AMPInfoViewController.m (100%) rename Sources/{Amplitude => EventExplorer}/Resources/AMPBubbleView.xib (100%) rename Sources/{Amplitude => EventExplorer}/Resources/AMPInfoViewController.xib (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/cancel.png (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/cancel@2x.png (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/cancel@3x.png (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/logo-banner.png (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/logo-banner@2x.png (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/logo-banner@3x.png (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/logo-button.png (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/logo-button@2x.png (100%) rename Sources/{Amplitude/Resources => EventExplorer/Resources/Images}/logo-button@3x.png (100%) diff --git a/.gitignore b/.gitignore index 93f4097d..4199c49d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,31 @@ .DS_STORE /Pods -*.xcuserdatad* -*.xccheckout /Build/ /DerivedData/ -*.xcworkspace/xcshareddata/*.xcscmblueprint Carthage/Build doc/ .swiftpm + +## Xcode user settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +*build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Gcc Patch +/*.gcno \ No newline at end of file diff --git a/Amplitude.podspec b/Amplitude.podspec index 4c96ff13..b5d509fe 100644 --- a/Amplitude.podspec +++ b/Amplitude.podspec @@ -12,24 +12,14 @@ Pod::Spec.new do |s| s.library = 'sqlite3.0' s.ios.deployment_target = '10.0' - s.ios.source_files = 'Sources/Amplitude/*.{h,m}' - s.ios.resources = 'Sources/Amplitude/**/*.{der,xib,png}' + s.ios.source_files = 'Sources/Amplitude/**/*.{h,m}', 'Sources/EventExplorer/*.{h,m}' + s.ios.resources = 'Sources/Amplitude/**/*.{der,xib,png}', 'Sources/EventExplorer/**/*.{der,xib,png}' s.tvos.deployment_target = '9.0' s.tvos.source_files = 'Sources/Amplitude/*.{h,m}' s.tvos.resources = 'Sources/Amplitude/**/*.{der}' - s.tvos.exclude_files = [ - 'Sources/Amplitude/AMPBubbleView.{h,m}', - 'Sources/Amplitude/AMPEventExplorer.{h,m}', - 'Sources/Amplitude/AMPInfoViewController.{h,m}' - ] s.osx.deployment_target = '10.10' s.osx.source_files = 'Sources/Amplitude/*.{h,m}' s.osx.resources = 'Sources/Amplitude/**/*.{der}' - s.osx.exclude_files = [ - 'Sources/Amplitude/AMPBubbleView.{h,m}', - 'Sources/Amplitude/AMPEventExplorer.{h,m}', - 'Sources/Amplitude/AMPInfoViewController.{h,m}' - ] end diff --git a/Amplitude.xcodeproj/project.pbxproj b/Amplitude.xcodeproj/project.pbxproj index db59c63e..7c6b6aad 100644 --- a/Amplitude.xcodeproj/project.pbxproj +++ b/Amplitude.xcodeproj/project.pbxproj @@ -142,20 +142,18 @@ 12C973C8241244F800E9CDDB /* AmplitudeTVOSTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 12C9732024108DFF00E9CDDB /* AmplitudeTVOSTests.m */; }; 12C973CF24131EB100E9CDDB /* SSLPinningTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 12C9731024108DFF00E9CDDB /* SSLPinningTests.m */; }; 12DF9471251DAC27008B2C25 /* AmplitudeiOSTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 12C9731A24108DFF00E9CDDB /* AmplitudeiOSTests.m */; }; - 12EAC02C2547D42B00382C8A /* cancel@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC0232547D42B00382C8A /* cancel@3x.png */; }; - 12EAC02D2547D42B00382C8A /* logo-banner@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC0242547D42B00382C8A /* logo-banner@3x.png */; }; - 12EAC02E2547D42B00382C8A /* logo-button.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC0252547D42B00382C8A /* logo-button.png */; }; - 12EAC02F2547D42B00382C8A /* logo-button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC0262547D42B00382C8A /* logo-button@2x.png */; }; - 12EAC0302547D42B00382C8A /* logo-banner@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC0272547D42B00382C8A /* logo-banner@2x.png */; }; - 12EAC0312547D42B00382C8A /* logo-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC0282547D42B00382C8A /* logo-banner.png */; }; - 12EAC0322547D42B00382C8A /* cancel.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC0292547D42B00382C8A /* cancel.png */; }; - 12EAC0332547D42B00382C8A /* cancel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC02A2547D42B00382C8A /* cancel@2x.png */; }; - 12EAC0342547D42B00382C8A /* logo-button@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC02B2547D42B00382C8A /* logo-button@3x.png */; }; - 12EAC03E2547D44300382C8A /* AMPBubbleView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC03B2547D44300382C8A /* AMPBubbleView.xib */; }; - 12EAC03F2547D44300382C8A /* ComodoRsaDomainValidationCA.der in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC03C2547D44300382C8A /* ComodoRsaDomainValidationCA.der */; }; - 12EAC0402547D44300382C8A /* AMPInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC03D2547D44300382C8A /* AMPInfoViewController.xib */; }; - 12EAC0472547D44E00382C8A /* ComodoRsaDomainValidationCA.der in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC03C2547D44300382C8A /* ComodoRsaDomainValidationCA.der */; }; - 12EAC04E2547D44F00382C8A /* ComodoRsaDomainValidationCA.der in Resources */ = {isa = PBXBuildFile; fileRef = 12EAC03C2547D44300382C8A /* ComodoRsaDomainValidationCA.der */; }; + 29E7B62D255E47B400AB9A5B /* AMPInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B62A255E47B400AB9A5B /* AMPInfoViewController.xib */; }; + 29E7B62E255E47B400AB9A5B /* AMPBubbleView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B62B255E47B400AB9A5B /* AMPBubbleView.xib */; }; + 29E7B62F255E47B400AB9A5B /* ComodoRsaDomainValidationCA.der in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B62C255E47B400AB9A5B /* ComodoRsaDomainValidationCA.der */; }; + 29E7B666255E487100AB9A5B /* cancel@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B65D255E487100AB9A5B /* cancel@3x.png */; }; + 29E7B667255E487100AB9A5B /* logo-button@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B65E255E487100AB9A5B /* logo-button@3x.png */; }; + 29E7B668255E487100AB9A5B /* cancel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B65F255E487100AB9A5B /* cancel@2x.png */; }; + 29E7B669255E487100AB9A5B /* logo-banner@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B660255E487100AB9A5B /* logo-banner@3x.png */; }; + 29E7B66A255E487100AB9A5B /* logo-button.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B661255E487100AB9A5B /* logo-button.png */; }; + 29E7B66B255E487100AB9A5B /* logo-banner@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B662255E487100AB9A5B /* logo-banner@2x.png */; }; + 29E7B66C255E487100AB9A5B /* logo-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B663255E487100AB9A5B /* logo-banner.png */; }; + 29E7B66D255E487100AB9A5B /* logo-button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B664255E487100AB9A5B /* logo-button@2x.png */; }; + 29E7B66E255E487100AB9A5B /* cancel.png in Resources */ = {isa = PBXBuildFile; fileRef = 29E7B665255E487100AB9A5B /* cancel.png */; }; 2FF530703C32718DA15D4013 /* libPods-shared-Amplitude_macOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F8C962279011799CE1B72F5 /* libPods-shared-Amplitude_macOSTests.a */; }; 5864D44A49419C011B0B2E05 /* libPods-shared-Amplitude_iOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 196EC1D108A62A030F1B58B1 /* libPods-shared-Amplitude_iOSTests.a */; }; 60CA723497169C7F79BE0BF9 /* libPods-shared-Amplitude_tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA18D859F9EB6DDF9522DF6E /* libPods-shared-Amplitude_tvOSTests.a */; }; @@ -259,21 +257,21 @@ 12D0A22B241A0A960072CB4C /* Amplitude.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Amplitude.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 12D0A22D241A134D0072CB4C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 12D0A22E241A13950072CB4C /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = ""; }; - 12EAC0232547D42B00382C8A /* cancel@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cancel@3x.png"; path = "Sources/Amplitude/Resources/cancel@3x.png"; sourceTree = ""; }; - 12EAC0242547D42B00382C8A /* logo-banner@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "logo-banner@3x.png"; path = "Sources/Amplitude/Resources/logo-banner@3x.png"; sourceTree = ""; }; - 12EAC0252547D42B00382C8A /* logo-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "logo-button.png"; path = "Sources/Amplitude/Resources/logo-button.png"; sourceTree = ""; }; - 12EAC0262547D42B00382C8A /* logo-button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "logo-button@2x.png"; path = "Sources/Amplitude/Resources/logo-button@2x.png"; sourceTree = ""; }; - 12EAC0272547D42B00382C8A /* logo-banner@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "logo-banner@2x.png"; path = "Sources/Amplitude/Resources/logo-banner@2x.png"; sourceTree = ""; }; - 12EAC0282547D42B00382C8A /* logo-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "logo-banner.png"; path = "Sources/Amplitude/Resources/logo-banner.png"; sourceTree = ""; }; - 12EAC0292547D42B00382C8A /* cancel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cancel.png; path = Sources/Amplitude/Resources/cancel.png; sourceTree = ""; }; - 12EAC02A2547D42B00382C8A /* cancel@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cancel@2x.png"; path = "Sources/Amplitude/Resources/cancel@2x.png"; sourceTree = ""; }; - 12EAC02B2547D42B00382C8A /* logo-button@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "logo-button@3x.png"; path = "Sources/Amplitude/Resources/logo-button@3x.png"; sourceTree = ""; }; - 12EAC03B2547D44300382C8A /* AMPBubbleView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AMPBubbleView.xib; path = Sources/Amplitude/Resources/AMPBubbleView.xib; sourceTree = ""; }; - 12EAC03C2547D44300382C8A /* ComodoRsaDomainValidationCA.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = ComodoRsaDomainValidationCA.der; path = Sources/Amplitude/Resources/ComodoRsaDomainValidationCA.der; sourceTree = ""; }; - 12EAC03D2547D44300382C8A /* AMPInfoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AMPInfoViewController.xib; path = Sources/Amplitude/Resources/AMPInfoViewController.xib; sourceTree = ""; }; 196EC1D108A62A030F1B58B1 /* libPods-shared-Amplitude_iOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-shared-Amplitude_iOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1EA2FCA6A86070E086933860 /* Pods-shared-Amplitude_iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-shared-Amplitude_iOSTests.release.xcconfig"; path = "Target Support Files/Pods-shared-Amplitude_iOSTests/Pods-shared-Amplitude_iOSTests.release.xcconfig"; sourceTree = ""; }; 1F8C962279011799CE1B72F5 /* libPods-shared-Amplitude_macOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-shared-Amplitude_macOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 29E7B62A255E47B400AB9A5B /* AMPInfoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AMPInfoViewController.xib; sourceTree = ""; }; + 29E7B62B255E47B400AB9A5B /* AMPBubbleView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AMPBubbleView.xib; sourceTree = ""; }; + 29E7B62C255E47B400AB9A5B /* ComodoRsaDomainValidationCA.der */ = {isa = PBXFileReference; lastKnownFileType = file; path = ComodoRsaDomainValidationCA.der; sourceTree = ""; }; + 29E7B65D255E487100AB9A5B /* cancel@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cancel@3x.png"; sourceTree = ""; }; + 29E7B65E255E487100AB9A5B /* logo-button@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-button@3x.png"; sourceTree = ""; }; + 29E7B65F255E487100AB9A5B /* cancel@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cancel@2x.png"; sourceTree = ""; }; + 29E7B660255E487100AB9A5B /* logo-banner@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-banner@3x.png"; sourceTree = ""; }; + 29E7B661255E487100AB9A5B /* logo-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-button.png"; sourceTree = ""; }; + 29E7B662255E487100AB9A5B /* logo-banner@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-banner@2x.png"; sourceTree = ""; }; + 29E7B663255E487100AB9A5B /* logo-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-banner.png"; sourceTree = ""; }; + 29E7B664255E487100AB9A5B /* logo-button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-button@2x.png"; sourceTree = ""; }; + 29E7B665255E487100AB9A5B /* cancel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = cancel.png; sourceTree = ""; }; 493212CA3C7E8FDA1FDC74E8 /* Pods-shared-Amplitude_macOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-shared-Amplitude_macOSTests.release.xcconfig"; path = "Target Support Files/Pods-shared-Amplitude_macOSTests/Pods-shared-Amplitude_macOSTests.release.xcconfig"; sourceTree = ""; }; 5F70334CA7CB86ECCCB1472A /* Pods-shared-Amplitude_tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-shared-Amplitude_tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-shared-Amplitude_tvOSTests/Pods-shared-Amplitude_tvOSTests.release.xcconfig"; sourceTree = ""; }; 6174D0A3357C218AF5BDE0FC /* libPods-shared-Amplitude_macOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-shared-Amplitude_macOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -365,6 +363,7 @@ 1279F8BE25244D78003DCE07 /* Sources */ = { isa = PBXGroup; children = ( + 29E7B613255E464800AB9A5B /* EventExplorer */, 1279F8BF25244D78003DCE07 /* Amplitude */, ); path = Sources; @@ -373,6 +372,8 @@ 1279F8BF25244D78003DCE07 /* Amplitude */ = { isa = PBXGroup; children = ( + 29E7B61D255E476C00AB9A5B /* Resources */, + 29E7B614255E467400AB9A5B /* SSLPinning */, 1279F8E525244D78003DCE07 /* AMPConfigManager.h */, 1279F8C525244D78003DCE07 /* AMPConfigManager.m */, 1279F8C625244D78003DCE07 /* AMPConstants.h */, @@ -397,39 +398,10 @@ 1279F8D125244D78003DCE07 /* AMPURLSession.m */, 1279F8E725244D78003DCE07 /* AMPUtils.h */, 1279F8C425244D78003DCE07 /* AMPUtils.m */, - 1279FA662525946E003DCE07 /* EventExplorer */, - 1279FA6725259474003DCE07 /* SSLPinning */, - 12EAC0212547D33200382C8A /* Supporting Files */, ); path = Amplitude; sourceTree = ""; }; - 1279FA662525946E003DCE07 /* EventExplorer */ = { - isa = PBXGroup; - children = ( - 1279FA83252594C1003DCE07 /* AMPBubbleView.h */, - 1279FA84252594C1003DCE07 /* AMPBubbleView.m */, - 1279FA80252594C1003DCE07 /* AMPEventExplorer.h */, - 1279FA82252594C1003DCE07 /* AMPEventExplorer.m */, - 1279FA85252594C1003DCE07 /* AMPInfoViewController.h */, - 1279FA81252594C1003DCE07 /* AMPInfoViewController.m */, - ); - name = EventExplorer; - sourceTree = ""; - }; - 1279FA6725259474003DCE07 /* SSLPinning */ = { - isa = PBXGroup; - children = ( - 1279FA6D2525949D003DCE07 /* ISPCertificatePinning.h */, - 1279FA682525949D003DCE07 /* ISPCertificatePinning.m */, - 1279FA6A2525949D003DCE07 /* ISPPinnedNSURLConnectionDelegate.h */, - 1279FA692525949D003DCE07 /* ISPPinnedNSURLConnectionDelegate.m */, - 1279FA6C2525949D003DCE07 /* ISPPinnedNSURLSessionDelegate.h */, - 1279FA6B2525949D003DCE07 /* ISPPinnedNSURLSessionDelegate.m */, - ); - name = SSLPinning; - sourceTree = ""; - }; 12C973012410758400E9CDDB /* Deployment */ = { isa = PBXGroup; children = ( @@ -476,32 +448,65 @@ name = "Recovered References"; sourceTree = ""; }; - 12EAC0212547D33200382C8A /* Supporting Files */ = { + 29E7B613255E464800AB9A5B /* EventExplorer */ = { isa = PBXGroup; children = ( - 12EAC03B2547D44300382C8A /* AMPBubbleView.xib */, - 12EAC03D2547D44300382C8A /* AMPInfoViewController.xib */, - 12EAC03C2547D44300382C8A /* ComodoRsaDomainValidationCA.der */, - 12EAC0222547D40200382C8A /* Images */, + 29E7B675255E4A3400AB9A5B /* Resources */, + 1279FA83252594C1003DCE07 /* AMPBubbleView.h */, + 1279FA84252594C1003DCE07 /* AMPBubbleView.m */, + 1279FA80252594C1003DCE07 /* AMPEventExplorer.h */, + 1279FA82252594C1003DCE07 /* AMPEventExplorer.m */, + 1279FA85252594C1003DCE07 /* AMPInfoViewController.h */, + 1279FA81252594C1003DCE07 /* AMPInfoViewController.m */, + ); + path = EventExplorer; + sourceTree = ""; + }; + 29E7B614255E467400AB9A5B /* SSLPinning */ = { + isa = PBXGroup; + children = ( + 1279FA6D2525949D003DCE07 /* ISPCertificatePinning.h */, + 1279FA682525949D003DCE07 /* ISPCertificatePinning.m */, + 1279FA6A2525949D003DCE07 /* ISPPinnedNSURLConnectionDelegate.h */, + 1279FA692525949D003DCE07 /* ISPPinnedNSURLConnectionDelegate.m */, + 1279FA6C2525949D003DCE07 /* ISPPinnedNSURLSessionDelegate.h */, + 1279FA6B2525949D003DCE07 /* ISPPinnedNSURLSessionDelegate.m */, + ); + path = SSLPinning; + sourceTree = ""; + }; + 29E7B61D255E476C00AB9A5B /* Resources */ = { + isa = PBXGroup; + children = ( + 29E7B62C255E47B400AB9A5B /* ComodoRsaDomainValidationCA.der */, ); - name = "Supporting Files"; - path = ../..; + path = Resources; + sourceTree = ""; + }; + 29E7B63E255E47FB00AB9A5B /* Images */ = { + isa = PBXGroup; + children = ( + 29E7B665255E487100AB9A5B /* cancel.png */, + 29E7B65F255E487100AB9A5B /* cancel@2x.png */, + 29E7B65D255E487100AB9A5B /* cancel@3x.png */, + 29E7B663255E487100AB9A5B /* logo-banner.png */, + 29E7B662255E487100AB9A5B /* logo-banner@2x.png */, + 29E7B660255E487100AB9A5B /* logo-banner@3x.png */, + 29E7B661255E487100AB9A5B /* logo-button.png */, + 29E7B664255E487100AB9A5B /* logo-button@2x.png */, + 29E7B65E255E487100AB9A5B /* logo-button@3x.png */, + ); + path = Images; sourceTree = ""; }; - 12EAC0222547D40200382C8A /* Images */ = { + 29E7B675255E4A3400AB9A5B /* Resources */ = { isa = PBXGroup; children = ( - 12EAC0292547D42B00382C8A /* cancel.png */, - 12EAC02A2547D42B00382C8A /* cancel@2x.png */, - 12EAC0232547D42B00382C8A /* cancel@3x.png */, - 12EAC0282547D42B00382C8A /* logo-banner.png */, - 12EAC0272547D42B00382C8A /* logo-banner@2x.png */, - 12EAC0242547D42B00382C8A /* logo-banner@3x.png */, - 12EAC0252547D42B00382C8A /* logo-button.png */, - 12EAC0262547D42B00382C8A /* logo-button@2x.png */, - 12EAC02B2547D42B00382C8A /* logo-button@3x.png */, - ); - name = Images; + 29E7B62B255E47B400AB9A5B /* AMPBubbleView.xib */, + 29E7B62A255E47B400AB9A5B /* AMPInfoViewController.xib */, + 29E7B63E255E47FB00AB9A5B /* Images */, + ); + path = Resources; sourceTree = ""; }; 4FEE653130E7AE135280BC48 /* Frameworks */ = { @@ -800,7 +805,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 12EAC0472547D44E00382C8A /* ComodoRsaDomainValidationCA.der in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -815,18 +819,18 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 12EAC0332547D42B00382C8A /* cancel@2x.png in Resources */, - 12EAC02D2547D42B00382C8A /* logo-banner@3x.png in Resources */, - 12EAC0302547D42B00382C8A /* logo-banner@2x.png in Resources */, - 12EAC0322547D42B00382C8A /* cancel.png in Resources */, - 12EAC02F2547D42B00382C8A /* logo-button@2x.png in Resources */, - 12EAC02C2547D42B00382C8A /* cancel@3x.png in Resources */, - 12EAC0312547D42B00382C8A /* logo-banner.png in Resources */, - 12EAC03F2547D44300382C8A /* ComodoRsaDomainValidationCA.der in Resources */, - 12EAC0342547D42B00382C8A /* logo-button@3x.png in Resources */, - 12EAC02E2547D42B00382C8A /* logo-button.png in Resources */, - 12EAC03E2547D44300382C8A /* AMPBubbleView.xib in Resources */, - 12EAC0402547D44300382C8A /* AMPInfoViewController.xib in Resources */, + 29E7B667255E487100AB9A5B /* logo-button@3x.png in Resources */, + 29E7B66B255E487100AB9A5B /* logo-banner@2x.png in Resources */, + 29E7B66C255E487100AB9A5B /* logo-banner.png in Resources */, + 29E7B66E255E487100AB9A5B /* cancel.png in Resources */, + 29E7B66D255E487100AB9A5B /* logo-button@2x.png in Resources */, + 29E7B62E255E47B400AB9A5B /* AMPBubbleView.xib in Resources */, + 29E7B666255E487100AB9A5B /* cancel@3x.png in Resources */, + 29E7B62F255E47B400AB9A5B /* ComodoRsaDomainValidationCA.der in Resources */, + 29E7B66A255E487100AB9A5B /* logo-button.png in Resources */, + 29E7B668255E487100AB9A5B /* cancel@2x.png in Resources */, + 29E7B62D255E47B400AB9A5B /* AMPInfoViewController.xib in Resources */, + 29E7B669255E487100AB9A5B /* logo-banner@3x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -841,7 +845,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 12EAC04E2547D44F00382C8A /* ComodoRsaDomainValidationCA.der in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Gemfile b/Gemfile index 00a6b3f8..538c58aa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'cocoapods' +gem 'cocoapods', '~>1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 15fef8ee..d196373d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods + cocoapods (~> 1.1) BUNDLED WITH 2.1.4 diff --git a/Package.swift b/Package.swift index 63993cfc..9d02dcc9 100644 --- a/Package.swift +++ b/Package.swift @@ -14,24 +14,35 @@ let package = Package( .library(name: "Amplitude", targets: ["Amplitude"]), ], targets: [ - .target( - name: "Amplitude", - path: "Sources/Amplitude", - exclude: ["AppledocSettings.plist"], + .target( + name: "EventExplorer", + path: "Sources/EventExplorer", resources: [ .process("Resources/AMPBubbleView.xib"), .process("Resources/AMPInfoViewController.xib"), - .process("Resources/cancel.png"), - .process("Resources/cancel@2x.png"), - .process("Resources/cancel@3x.png"), - .process("Resources/ComodoRsaDomainValidationCA.der"), - .process("Resources/logo-banner.png"), - .process("Resources/logo-banner@2x.png"), - .process("Resources/logo-banner@3x.png"), - .process("Resources/logo-button.png"), - .process("Resources/logo-button@2x.png"), - .process("Resources/logo-button@3x.png") + .process("Resources/Images/cancel.png"), + .process("Resources/Images/cancel@2x.png"), + .process("Resources/Images/cancel@3x.png"), + .process("Resources/Images/logo-banner.png"), + .process("Resources/Images/logo-banner@2x.png"), + .process("Resources/Images/logo-banner@3x.png"), + .process("Resources/Images/logo-button.png"), + .process("Resources/Images/logo-button@2x.png"), + .process("Resources/Images/logo-button@3x.png") + ], + publicHeadersPath: ".", + cSettings: [ + .headerSearchPath("../Amplitude") + ] + ), + .target( + name: "Amplitude", + dependencies: [ + .target(name: "EventExplorer", condition: .when(platforms: [.iOS])), ], - publicHeadersPath: ".") + path: "Sources/Amplitude", + resources: [.process("Resources/ComodoRsaDomainValidationCA.der")], + publicHeadersPath: "."), ] ) + diff --git a/Podfile.lock b/Podfile.lock index e8e82a22..949b9b27 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: c234af1832073dccffe31825daef96d6b0eb126c -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.0 diff --git a/Sources/Amplitude/ISPCertificatePinning.h b/Sources/Amplitude/SSLPinning/ISPCertificatePinning.h similarity index 100% rename from Sources/Amplitude/ISPCertificatePinning.h rename to Sources/Amplitude/SSLPinning/ISPCertificatePinning.h diff --git a/Sources/Amplitude/ISPCertificatePinning.m b/Sources/Amplitude/SSLPinning/ISPCertificatePinning.m similarity index 100% rename from Sources/Amplitude/ISPCertificatePinning.m rename to Sources/Amplitude/SSLPinning/ISPCertificatePinning.m diff --git a/Sources/Amplitude/ISPPinnedNSURLConnectionDelegate.h b/Sources/Amplitude/SSLPinning/ISPPinnedNSURLConnectionDelegate.h similarity index 100% rename from Sources/Amplitude/ISPPinnedNSURLConnectionDelegate.h rename to Sources/Amplitude/SSLPinning/ISPPinnedNSURLConnectionDelegate.h diff --git a/Sources/Amplitude/ISPPinnedNSURLConnectionDelegate.m b/Sources/Amplitude/SSLPinning/ISPPinnedNSURLConnectionDelegate.m similarity index 100% rename from Sources/Amplitude/ISPPinnedNSURLConnectionDelegate.m rename to Sources/Amplitude/SSLPinning/ISPPinnedNSURLConnectionDelegate.m diff --git a/Sources/Amplitude/ISPPinnedNSURLSessionDelegate.h b/Sources/Amplitude/SSLPinning/ISPPinnedNSURLSessionDelegate.h similarity index 100% rename from Sources/Amplitude/ISPPinnedNSURLSessionDelegate.h rename to Sources/Amplitude/SSLPinning/ISPPinnedNSURLSessionDelegate.h diff --git a/Sources/Amplitude/ISPPinnedNSURLSessionDelegate.m b/Sources/Amplitude/SSLPinning/ISPPinnedNSURLSessionDelegate.m similarity index 100% rename from Sources/Amplitude/ISPPinnedNSURLSessionDelegate.m rename to Sources/Amplitude/SSLPinning/ISPPinnedNSURLSessionDelegate.m diff --git a/Sources/Amplitude/AMPBubbleView.h b/Sources/EventExplorer/AMPBubbleView.h similarity index 100% rename from Sources/Amplitude/AMPBubbleView.h rename to Sources/EventExplorer/AMPBubbleView.h diff --git a/Sources/Amplitude/AMPBubbleView.m b/Sources/EventExplorer/AMPBubbleView.m similarity index 100% rename from Sources/Amplitude/AMPBubbleView.m rename to Sources/EventExplorer/AMPBubbleView.m diff --git a/Sources/Amplitude/AMPEventExplorer.h b/Sources/EventExplorer/AMPEventExplorer.h similarity index 100% rename from Sources/Amplitude/AMPEventExplorer.h rename to Sources/EventExplorer/AMPEventExplorer.h diff --git a/Sources/Amplitude/AMPEventExplorer.m b/Sources/EventExplorer/AMPEventExplorer.m similarity index 100% rename from Sources/Amplitude/AMPEventExplorer.m rename to Sources/EventExplorer/AMPEventExplorer.m diff --git a/Sources/Amplitude/AMPInfoViewController.h b/Sources/EventExplorer/AMPInfoViewController.h similarity index 100% rename from Sources/Amplitude/AMPInfoViewController.h rename to Sources/EventExplorer/AMPInfoViewController.h diff --git a/Sources/Amplitude/AMPInfoViewController.m b/Sources/EventExplorer/AMPInfoViewController.m similarity index 100% rename from Sources/Amplitude/AMPInfoViewController.m rename to Sources/EventExplorer/AMPInfoViewController.m diff --git a/Sources/Amplitude/Resources/AMPBubbleView.xib b/Sources/EventExplorer/Resources/AMPBubbleView.xib similarity index 100% rename from Sources/Amplitude/Resources/AMPBubbleView.xib rename to Sources/EventExplorer/Resources/AMPBubbleView.xib diff --git a/Sources/Amplitude/Resources/AMPInfoViewController.xib b/Sources/EventExplorer/Resources/AMPInfoViewController.xib similarity index 100% rename from Sources/Amplitude/Resources/AMPInfoViewController.xib rename to Sources/EventExplorer/Resources/AMPInfoViewController.xib diff --git a/Sources/Amplitude/Resources/cancel.png b/Sources/EventExplorer/Resources/Images/cancel.png similarity index 100% rename from Sources/Amplitude/Resources/cancel.png rename to Sources/EventExplorer/Resources/Images/cancel.png diff --git a/Sources/Amplitude/Resources/cancel@2x.png b/Sources/EventExplorer/Resources/Images/cancel@2x.png similarity index 100% rename from Sources/Amplitude/Resources/cancel@2x.png rename to Sources/EventExplorer/Resources/Images/cancel@2x.png diff --git a/Sources/Amplitude/Resources/cancel@3x.png b/Sources/EventExplorer/Resources/Images/cancel@3x.png similarity index 100% rename from Sources/Amplitude/Resources/cancel@3x.png rename to Sources/EventExplorer/Resources/Images/cancel@3x.png diff --git a/Sources/Amplitude/Resources/logo-banner.png b/Sources/EventExplorer/Resources/Images/logo-banner.png similarity index 100% rename from Sources/Amplitude/Resources/logo-banner.png rename to Sources/EventExplorer/Resources/Images/logo-banner.png diff --git a/Sources/Amplitude/Resources/logo-banner@2x.png b/Sources/EventExplorer/Resources/Images/logo-banner@2x.png similarity index 100% rename from Sources/Amplitude/Resources/logo-banner@2x.png rename to Sources/EventExplorer/Resources/Images/logo-banner@2x.png diff --git a/Sources/Amplitude/Resources/logo-banner@3x.png b/Sources/EventExplorer/Resources/Images/logo-banner@3x.png similarity index 100% rename from Sources/Amplitude/Resources/logo-banner@3x.png rename to Sources/EventExplorer/Resources/Images/logo-banner@3x.png diff --git a/Sources/Amplitude/Resources/logo-button.png b/Sources/EventExplorer/Resources/Images/logo-button.png similarity index 100% rename from Sources/Amplitude/Resources/logo-button.png rename to Sources/EventExplorer/Resources/Images/logo-button.png diff --git a/Sources/Amplitude/Resources/logo-button@2x.png b/Sources/EventExplorer/Resources/Images/logo-button@2x.png similarity index 100% rename from Sources/Amplitude/Resources/logo-button@2x.png rename to Sources/EventExplorer/Resources/Images/logo-button@2x.png diff --git a/Sources/Amplitude/Resources/logo-button@3x.png b/Sources/EventExplorer/Resources/Images/logo-button@3x.png similarity index 100% rename from Sources/Amplitude/Resources/logo-button@3x.png rename to Sources/EventExplorer/Resources/Images/logo-button@3x.png