Skip to content

Commit 09a6402

Browse files
Hongyan JiangGitHub Enterprise
authored andcommitted
Prepare release 1.8.0 (#46)
* add Privacy Manifest File PrivacyInfo.xcprivacy to iOSAgent * update GzipSwift version to 6.0.1 * upgrade swift version to 5.4
1 parent 22532b4 commit 09a6402

File tree

14 files changed

+86
-165
lines changed

14 files changed

+86
-165
lines changed

Changelog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Changelog
22

3-
## 1.7.1
3+
## 1.8.0
44
- add to mobile feature list if `autoCaptureScreenNames` is enabled
5+
- add Privacy Manifest File PrivacyInfo.xcprivacy to iOSAgent
6+
- update to Swift version 5.4, update GzipSwift version to 6.0.1 for spm
57

68
## 1.7.0
79
- introduce `autoCaptureScreenNames` to auto capture view names and `debugAllScreenNames` to debug all screen names

Dev/InstanaAgentExample.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
72976A9A2681C45800A284F6 /* Webserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72976A992681C45800A284F6 /* Webserver.swift */; };
3030
729C88B5270DE98200492486 /* AFNetworking in Frameworks */ = {isa = PBXBuildFile; productRef = 729C88B4270DE98200492486 /* AFNetworking */; };
3131
729C88B8270DF13700492486 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 729C88B7270DF13700492486 /* Alamofire */; };
32+
A4059B1F2BD067A400C471B6 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A4059B1E2BD067A400C471B6 /* PrivacyInfo.xcprivacy */; };
33+
A412ECE52BCF3F6C007212F9 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = A412ECE42BCF3F6C007212F9 /* PrivacyInfo.xcprivacy */; };
3234
A46F87782B44DE8D00302343 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A46F87772B44DE8D00302343 /* AppDelegate.m */; };
3335
A46F877B2B44DE8D00302343 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A46F877A2B44DE8D00302343 /* SceneDelegate.m */; };
3436
A46F877E2B44DE8D00302343 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A46F877D2B44DE8D00302343 /* ViewController.m */; };
@@ -78,6 +80,8 @@
7880
727AF73A263AA0FA00B9C59B /* EventListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventListViewController.swift; sourceTree = "<group>"; };
7981
72976A992681C45800A284F6 /* Webserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Webserver.swift; path = "../../Tests/InstanaAgentTests/Test helpers/Webserver.swift"; sourceTree = "<group>"; };
8082
72FBE8A7263AACDB00CF2CDE /* InstanaAgentExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = InstanaAgentExample.entitlements; sourceTree = "<group>"; };
83+
A4059B1E2BD067A400C471B6 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
84+
A412ECE42BCF3F6C007212F9 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
8185
A46F87742B44DE8D00302343 /* ObjectiveCAppExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ObjectiveCAppExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
8286
A46F87762B44DE8D00302343 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8387
A46F87772B44DE8D00302343 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -186,6 +190,7 @@
186190
727AF691263A9EBE00B9C59B /* Assets.xcassets */,
187191
727AF693263A9EBE00B9C59B /* LaunchScreen.storyboard */,
188192
727AF696263A9EBE00B9C59B /* Info.plist */,
193+
A412ECE42BCF3F6C007212F9 /* PrivacyInfo.xcprivacy */,
189194
);
190195
path = InstanaAgentExample;
191196
sourceTree = "<group>";
@@ -222,6 +227,7 @@
222227
A46F87842B44DE8E00302343 /* LaunchScreen.storyboard */,
223228
A46F87872B44DE8E00302343 /* Info.plist */,
224229
A46F87882B44DE8E00302343 /* main.m */,
230+
A4059B1E2BD067A400C471B6 /* PrivacyInfo.xcprivacy */,
225231
);
226232
path = ObjectiveCAppExample;
227233
sourceTree = "<group>";
@@ -379,6 +385,7 @@
379385
files = (
380386
727AF695263A9EBE00B9C59B /* LaunchScreen.storyboard in Resources */,
381387
727AF692263A9EBE00B9C59B /* Assets.xcassets in Resources */,
388+
A412ECE52BCF3F6C007212F9 /* PrivacyInfo.xcprivacy in Resources */,
382389
727AF690263A9EBD00B9C59B /* Main.storyboard in Resources */,
383390
);
384391
runOnlyForDeploymentPostprocessing = 0;
@@ -396,6 +403,7 @@
396403
files = (
397404
A46F87862B44DE8E00302343 /* LaunchScreen.storyboard in Resources */,
398405
A46F87832B44DE8E00302343 /* Assets.xcassets in Resources */,
406+
A4059B1F2BD067A400C471B6 /* PrivacyInfo.xcprivacy in Resources */,
399407
A46F87812B44DE8D00302343 /* Main.storyboard in Resources */,
400408
);
401409
runOnlyForDeploymentPostprocessing = 0;

Dev/InstanaAgentExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyCollectedDataTypes</key>
6+
<array/>
7+
</dict>
8+
</plist>

Dev/InstanaAgentExample/PrivacyInfo_default.xcprivacy

Lines changed: 0 additions & 31 deletions
This file was deleted.

Dev/InstanaAgentExample/PrivacyInfo_full.xcprivacy

Lines changed: 0 additions & 82 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyCollectedDataTypes</key>
6+
<array>
7+
<dict>
8+
<key>NSPrivacyCollectedDataType</key>
9+
<string></string>
10+
<key>NSPrivacyCollectedDataTypeLinked</key>
11+
<false/>
12+
<key>NSPrivacyCollectedDataTypeTracking</key>
13+
<false/>
14+
<key>NSPrivacyCollectedDataTypePurposes</key>
15+
<array>
16+
<string></string>
17+
</array>
18+
</dict>
19+
</array>
20+
</dict>
21+
</plist>

InstanaAgent.podspec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
#
1717

1818
s.name = "InstanaAgent"
19-
s.version = "1.7.1"
19+
s.version = "1.8.0"
2020
s.summary = "Instana iOS agent."
2121

2222
# This description is used to generate tags and improve search results.
@@ -92,6 +92,9 @@ Pod::Spec.new do |s|
9292
#
9393

9494
s.dependency "GzipSwift"
95+
s.resource_bundle = {
96+
"InstanaAgent" => "Sources/InstanaAgent/Resources/PrivacyInfo.xcprivacy"
97+
}
9598

9699
# ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
97100
#
@@ -100,6 +103,6 @@ Pod::Spec.new do |s|
100103
# you can include multiple dependencies to ensure it works.
101104

102105
s.requires_arc = true
103-
s.swift_versions = ['5.1', '5.2', '5.3']
106+
s.swift_versions = '5.4'
104107

105108
end

Package.resolved

Lines changed: 11 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.1
1+
// swift-tools-version:5.4
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -13,15 +13,22 @@ let package = Package(
1313
targets: ["InstanaAgent"]),
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/1024jp/GzipSwift.git", from: "5.0.0")
16+
.package(url: "https://github.com/1024jp/GzipSwift.git", from: "6.0.1")
1717
],
1818
targets: [
1919
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
2020
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
2121
.target(name: "ImageTracker", dependencies: [], publicHeadersPath: ""),
2222
.target(
2323
name: "InstanaAgent",
24-
dependencies: ["Gzip", "ImageTracker"]),
24+
dependencies: [
25+
.product(name: "Gzip", package: "GzipSwift"),
26+
"ImageTracker"
27+
],
28+
resources: [
29+
.copy("Resources/PrivacyInfo.xcprivacy")
30+
]
31+
),
2532
.testTarget(
2633
name: "InstanaAgentTests",
2734
dependencies: ["InstanaAgent", "ImageTracker"]),

0 commit comments

Comments
 (0)