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.

Sign up for GitHub

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

Jump to bottom

Make privacy manifest a resource, min iOS -> 11.0 #1024

Merged
merged 2 commits into from
Mar 25, 2024
Merged

Make privacy manifest a resource, min iOS -> 11.0 #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d6694
make privacy manifest a resource, min iOS -> 12.0
jaredmixpanel Mar 25, 2024
e46ee38
ios and tvos min -> 11.0
jaredmixpanel Mar 25, 2024
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
5 changes: 3 additions & 2 deletions Mixpanel.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ Pod::Spec.new do |s|
s.license = 'Apache License, Version 2.0'
s.author = { 'Mixpanel, Inc' => 'support@mixpanel.com' }
s.source = { :git => 'https://github.com/mixpanel/mixpanel-iphone.git', :tag => "v#{s.version}" }
s.resources = 'Sources/Mixpanel/PrivacyInfo.xcprivacy'
s.requires_arc = true
s.libraries = 'icucore'
s.swift_version = '4.2'
s.ios.deployment_target = '13.0'
s.ios.deployment_target = '11.0'
all_files = 'Sources/**/*.{m,h}'
public_header_files = 'Sources/Mixpanel.h', 'Sources/MixpanelType.h', 'Sources/MixpanelGroup.h', 'Sources/MixpanelType.h', 'Sources/MixpanelPeople.h'
private_header_files = 'Sources/MixpanelPeoplePrivate.h', 'Sources/MixpanelGroupPrivate.h', 'Sources/MPNetworkPrivate.h', 'Sources/MixpanelPrivate.h', 'Sources/SessionMetadata.h', 'Sources/MixpanelIdentity.h', 'Sources/MPJSONHander.h', 'Sources/MixpanelPersistence.h', 'Sources/MPDB.h'
Expand All @@ -18,7 +19,7 @@ Pod::Spec.new do |s|
s.ios.public_header_files = public_header_files
s.ios.private_header_files = private_header_files
s.ios.frameworks = 'UIKit', 'Foundation', 'SystemConfiguration', 'CoreTelephony', 'Accelerate', 'CoreGraphics', 'QuartzCore', 'StoreKit'
s.tvos.deployment_target = '12.0'
s.tvos.deployment_target = '11.0'
s.tvos.source_files = all_files
s.tvos.exclude_files = 'Sources/MixpanelWatchProperties.{m,h}','Sources/Include/*.h'
s.tvos.public_header_files = public_header_files
Expand Down
26 changes: 21 additions & 5 deletions Mixpanel.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
17B097712707A66F00492E14 /* MixpanelPersistence.m in Sources */ = {isa = PBXBuildFile; fileRef = 17B0976F2707A66F00492E14 /* MixpanelPersistence.m */; };
17B097722707A66F00492E14 /* MixpanelPersistence.m in Sources */ = {isa = PBXBuildFile; fileRef = 17B0976F2707A66F00492E14 /* MixpanelPersistence.m */; };
17B097732707A66F00492E14 /* MixpanelPersistence.m in Sources */ = {isa = PBXBuildFile; fileRef = 17B0976F2707A66F00492E14 /* MixpanelPersistence.m */; };
17D33A252BB1E39F006EF5F7 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1706BC3B2BA8BBA400FC0754 /* PrivacyInfo.xcprivacy */; };
17D33A262BB1E3A5006EF5F7 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1706BC3B2BA8BBA400FC0754 /* PrivacyInfo.xcprivacy */; };
17D33A272BB1E3A9006EF5F7 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1706BC3B2BA8BBA400FC0754 /* PrivacyInfo.xcprivacy */; };
17D33A282BB1E3B0006EF5F7 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1706BC3B2BA8BBA400FC0754 /* PrivacyInfo.xcprivacy */; };
511FC3591C2B74BD00DC4796 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C170D451A4A05A000D9E0F2 /* Foundation.framework */; };
513243441D1B473100CBA9AA /* WatchKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 513243431D1B473100CBA9AA /* WatchKit.framework */; };
519AD7A41CB706A6005411A5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 519AD7A31CB706A6005411A5 /* Security.framework */; };
Expand Down Expand Up @@ -313,6 +317,14 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
17D33A292BB1E60A006EF5F7 /* Mixpanel */ = {
isa = PBXGroup;
children = (
1706BC3B2BA8BBA400FC0754 /* PrivacyInfo.xcprivacy */,
);
path = Mixpanel;
sourceTree = "<group>";
};
7C170C201A4A02F500D9E0F2 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -352,7 +364,6 @@
7C170C2D1A4A02F500D9E0F2 /* Supporting Files */ = {
isa = PBXGroup;
children = (
1706BC3B2BA8BBA400FC0754 /* PrivacyInfo.xcprivacy */,
86543180260AB3F800C478DE /* ios.modulemap */,
86543182260AB3F800C478DE /* macos.modulemap */,
86543183260AB3F800C478DE /* tvos.modulemap */,
Expand Down Expand Up @@ -387,6 +398,7 @@
86542F83260AB0FA00C478DE /* Sources */ = {
isa = PBXGroup;
children = (
17D33A292BB1E60A006EF5F7 /* Mixpanel */,
86AE15A027BB29B400E271B2 /* Log */,
86AE159C27BB297A00E271B2 /* Utilities */,
86AE159B27BB296A00E271B2 /* Networking */,
Expand Down Expand Up @@ -758,13 +770,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
17D33A262BB1E3A5006EF5F7 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
7C170C281A4A02F500D9E0F2 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
17D33A252BB1E39F006EF5F7 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -793,13 +807,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
17D33A272BB1E3A9006EF5F7 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
E1F160AE1E677D2200391AE3 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
17D33A282BB1E3B0006EF5F7 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1109,7 +1125,7 @@
GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INSTALL_PATH = "@rpath";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = Sources/ios.modulemap;
OTHER_CFLAGS = "";
Expand Down Expand Up @@ -1150,7 +1166,7 @@
GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INSTALL_PATH = "@rpath";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = Sources/ios.modulemap;
OTHER_CFLAGS = "";
Expand Down Expand Up @@ -1417,7 +1433,7 @@
SDKROOT = appletvos;
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Debug;
Expand Down Expand Up @@ -1458,7 +1474,7 @@
SDKROOT = appletvos;
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 12.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Release;
Expand Down
11 changes: 7 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import PackageDescription
let package = Package(
name: "Mixpanel",
platforms: [
.iOS(.v9),
.tvOS(.v9),
.macOS(.v10_10),
.watchOS(.v3),
.iOS(.v11),
.tvOS(.v11),
.macOS(.v10_13),
.watchOS(.v4),
],
products: [
.library(name: "Mixpanel", targets: ["Mixpanel"]),
Expand All @@ -17,6 +17,9 @@ let package = Package(
.target(
name: "Mixpanel",
path: "Sources",
resources: [
.copy("Mixpanel/PrivacyInfo.xcprivacy")
],
cSettings: [
.headerSearchPath("."),
]
Expand Down
0 PrivacyInfo.xcprivacy → Sources/Mixpanel/PrivacyInfo.xcprivacy
View file
Open in desktop
File renamed without changes.
Loading