Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: SPM macOS/tvOS disable event explorer #315

Merged
merged 13 commits into from
Nov 17, 2020
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .build/manifest.db
Binary file not shown.
14 changes: 2 additions & 12 deletions Amplitude.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
179 changes: 91 additions & 88 deletions Amplitude.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

40 changes: 25 additions & 15 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,34 @@ 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/[email protected]"),
.process("Resources/[email protected]"),
.process("Resources/ComodoRsaDomainValidationCA.der"),
.process("Resources/logo-banner.png"),
.process("Resources/[email protected]"),
.process("Resources/[email protected]"),
.process("Resources/logo-button.png"),
.process("Resources/[email protected]"),
.process("Resources/[email protected]")
.process("Resources/Images/cancel.png"),
haoliu-amp marked this conversation as resolved.
Show resolved Hide resolved
.process("Resources/Images/[email protected]"),
.process("Resources/Images/[email protected]"),
.process("Resources/Images/logo-banner.png"),
.process("Resources/Images/[email protected]"),
.process("Resources/Images/[email protected]"),
.process("Resources/Images/logo-button.png"),
.process("Resources/Images/[email protected]"),
.process("Resources/Images/[email protected]")
],
publicHeadersPath: ".")
publicHeadersPath: ".",
cSettings: [
.headerSearchPath("../Amplitude")
haoliu-amp marked this conversation as resolved.
Show resolved Hide resolved
]
),
.target(
name: "Amplitude",
dependencies: [
.target(name: "EventExplorer", condition: .when(platforms: [.iOS])),
],
path: "Sources/Amplitude",
resources: [.process("Resources/ComodoRsaDomainValidationCA.der")],
publicHeadersPath: "."),
]
)