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

chore(client/cordova/apple/ios): add privacy info to comply with Apple's API changes #2009

Merged
merged 14 commits into from
May 24, 2024
Merged

chore(client/cordova/apple/ios): add privacy info to comply with Apple's API changes #2009

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
22f3cb5
initial commit - just need to select the reasons
daniellacosse May 8, 2024
bc7c3c4
missed one
daniellacosse May 8, 2024
cca70da
Merge branch 'master' into daniellacosse/apple_privacy_required_reasons
daniellacosse May 13, 2024
1510e4f
add known required reason
daniellacosse May 13, 2024
33a9160
update sentry but it probably breaks it
daniellacosse May 14, 2024
148cdd6
package resolved
daniellacosse May 14, 2024
f654bed
Merge branch 'master' into daniellacosse/apple_privacy_required_reasons
daniellacosse May 15, 2024
e644152
Merge remote-tracking branch 'origin/master' into daniellacosse/apple…
sbruens May 21, 2024
f1468bd
Upgrade Sentry to latest version `8.26.0`.
sbruens May 22, 2024
ca7f91c
Upgrade CocoaLumberjack to latest version `3.8.5`.
sbruens May 22, 2024
b00feaf
Remove API types used by dependencies.
sbruens May 23, 2024
09a5c3e
Merge remote-tracking branch 'origin/master' into daniellacosse/apple…
sbruens May 23, 2024
163c214
Remove stray `Package.resolved` file.
sbruens May 23, 2024
33996d5
Merge remote-tracking branch 'origin/master' into daniellacosse/apple…
sbruens May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/src/cordova/apple/OutlineAppleLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.7.4"),
.package(url: "https://github.com/getsentry/sentry-cocoa", from: "7.31.3"),
.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.8.5"),
.package(url: "https://github.com/getsentry/sentry-cocoa", from: "8.26.0"),
],
targets: [
.target(
Expand Down
4 changes: 2 additions & 2 deletions ...t/src/cordova/apple/OutlineAppleLib/Sources/OutlineSentryLogger/OutlineSentryLogger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class OutlineSentryLogger: DDAbstractLogger {
let breadcrumb = Breadcrumb(level: ddLogLevelToSentryLevel(logMessage.level), category:"App")
breadcrumb.message = logMessage.message
breadcrumb.timestamp = logMessage.timestamp
SentrySDK.addBreadcrumb(crumb: breadcrumb)
SentrySDK.addBreadcrumb(breadcrumb)
}

private func ddLogLevelToSentryLevel(_ level: DDLogLevel) -> SentryLevel {
Expand Down Expand Up @@ -88,7 +88,7 @@ public class OutlineSentryLogger: DDAbstractLogger {
let breadcrumb = Breadcrumb(level: .info, category: "VpnExtension")
breadcrumb.timestamp = dateFormatter.date(from: timestamp)
breadcrumb.message = message
SentrySDK.addBreadcrumb(crumb: breadcrumb)
SentrySDK.addBreadcrumb(breadcrumb)
numBreadcrumbsAdded += 1
}
}
Expand Down
8 changes: 4 additions & 4 deletions client/src/cordova/apple/ios.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/CocoaLumberjack/CocoaLumberjack",
"state" : {
"revision" : "0188d31089b5881a269e01777be74c7316924346",
"version" : "3.8.0"
"revision" : "4b8714a7fb84d42393314ce897127b3939885ec3",
"version" : "3.8.5"
}
},
{
"identity" : "sentry-cocoa",
"kind" : "remoteSourceControl",
"location" : "https://github.com/getsentry/sentry-cocoa",
"state" : {
"revision" : "cf43eac1aa12017868c257ad3854ad87a5de0758",
"version" : "7.31.5"
"revision" : "7fc7ca43967e2980d8691a8e017c118a84133aac",
"version" : "8.26.0"
}
},
{
Expand Down
8 changes: 4 additions & 4 deletions client/src/cordova/apple/macos.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/CocoaLumberjack/CocoaLumberjack",
"state" : {
"revision" : "0188d31089b5881a269e01777be74c7316924346",
"version" : "3.8.0"
"revision" : "4b8714a7fb84d42393314ce897127b3939885ec3",
"version" : "3.8.5"
}
},
{
"identity" : "sentry-cocoa",
"kind" : "remoteSourceControl",
"location" : "https://github.com/getsentry/sentry-cocoa",
"state" : {
"revision" : "cf43eac1aa12017868c257ad3854ad87a5de0758",
"version" : "7.31.5"
"revision" : "7fc7ca43967e2980d8691a8e017c118a84133aac",
"version" : "8.26.0"
}
},
{
Expand Down
8 changes: 6 additions & 2 deletions client/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
52CE53E7295B6A310064D03D /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 52CE53E6295B6A310064D03D /* Sentry */; };
52E783062A5880CF00355E64 /* PacketTunnelProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 52E783052A5880CF00355E64 /* PacketTunnelProvider */; };
5F7F90AE0E924FD7B065C415 /* CDVStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 0394302BA6114B2AB648D4FF /* CDVStatusBar.m */; };
65A9AC9C2BEC091700C5899F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 65A9AC9B2BEC091700C5899F /* PrivacyInfo.xcprivacy */; };
6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; };
A246B7E52B07AADD00ECACD5 /* AppKitIntegration.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A246B7DD2B07AACF00ECACD5 /* AppKitIntegration.framework */; platformFilter = maccatalyst; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
A25FB7DC2B0D4420009B6B5F /* AppKitIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = A272490D2B0D20530018A598 /* AppKitIntegration.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -171,6 +172,7 @@
3B0347431F212E6500C8EF1F /* Outline.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Outline.entitlements; path = Outline/Outline.entitlements; sourceTree = "<group>"; };
3B0347481F212F0100C8EF1F /* VpnExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = VpnExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
3B03475B1F212F2D00C8EF1F /* VpnExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; name = VpnExtension.entitlements; path = Outline/VpnExtension.entitlements; sourceTree = SOURCE_ROOT; };
65A9AC9B2BEC091700C5899F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CDVLaunchScreen.storyboard; path = Outline/CDVLaunchScreen.storyboard; sourceTree = SOURCE_ROOT; };
8D1107310486CEB800E47090 /* Outline-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Outline-Info.plist"; path = "Outline/Outline-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = SOURCE_ROOT; };
91E45572BB494E9299D2DD41 /* CDVClipboard.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVClipboard.m; path = "cordova-plugin-clipboard/CDVClipboard.m"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -326,6 +328,7 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
65A9AC9B2BEC091700C5899F /* PrivacyInfo.xcprivacy */,
F6D33648296CF46200AFD613 /* Packages */,
3B0347431F212E6500C8EF1F /* Outline.entitlements */,
EB87FDF41871DAF40020F90C /* config.xml */,
Expand Down Expand Up @@ -731,6 +734,7 @@
files = (
302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */,
0207DA581B56EA530066E2B4 /* Assets.xcassets in Resources */,
65A9AC9C2BEC091700C5899F /* PrivacyInfo.xcprivacy in Resources */,
6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -1500,15 +1504,15 @@
repositoryURL = "https://github.com/CocoaLumberjack/CocoaLumberjack";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.7.4;
minimumVersion = 3.8.5;
};
};
52CE53E5295B6A310064D03D /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/getsentry/sentry-cocoa";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 7.31.3;
minimumVersion = 8.26.0;
fortuna marked this conversation as resolved.
Show resolved Hide resolved
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
4 changes: 2 additions & 2 deletions ...ple/xcode/ios/Outline.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/getsentry/sentry-cocoa",
"state" : {
"revision" : "cf43eac1aa12017868c257ad3854ad87a5de0758",
"version" : "7.31.5"
"revision" : "7fc7ca43967e2980d8691a8e017c118a84133aac",
"version" : "8.26.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be applied to macOS too.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to update this file for macos too?

Copy link
Contributor

@sbruens sbruens May 23, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what this file is doing here actually. It seems to have been newly created in #1958. The ios and macos Package.resolved files are already correctly updated in client/src/cordova/apple/ios.xcworkspace/xcshareddata/swiftpm/Package.resolved and client/src/cordova/apple/macos.xcworkspace/xcshareddata/swiftpm/Package.resolved respectively. Removing this file altogether.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it works fine because we specify the full version and the revision is probably mapped 1:1 to the full version.

This picks the version if the version is not fully specified, similar to package-lock.json or go.sum

Copy link
Contributor

@sbruens sbruens May 24, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, but my point is that this particular file isn't actually used. The Package.resolved files you are talking about are located under a different path, and are correctly updated in this PR. This particular file isn't used at all AFAICT and was likely erroneously added during the client move.

}
},
{
Expand Down
17 changes: 17 additions & 0 deletions client/src/cordova/apple/xcode/ios/PrivacyInfo.xcprivacy
View file
Open in desktop
fortuna marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>1C8F.1</string>
</array>
</dict>
</array>
</dict>
</plist>
6 changes: 3 additions & 3 deletions client/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -984,15 +984,15 @@
repositoryURL = "https://github.com/getsentry/sentry-cocoa";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 7.31.3;
minimumVersion = 8.26.0;
};
};
52CBB847295BC79300D0073F /* XCRemoteSwiftPackageReference "CocoaLumberjack" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/CocoaLumberjack/CocoaLumberjack";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.7.4;
minimumVersion = 3.8.5;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down