Skip to content

Commit 3c7014d

Browse files
authored
Merge pull request #22 from instana/enable_macos_with_appkit_and_clean_up_example
macOS Support and project clean up
2 parents 18267c0 + ef83ed0 commit 3c7014d

File tree

80 files changed

+2187
-1145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2187
-1145
lines changed

.swiftpm/xcode/xcshareddata/xcschemes/InstanaAgent.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

.swiftpm/xcode/xcshareddata/xcschemes/InstanaAgentTests.xcscheme

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,8 +10,7 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES"
14-
codeCoverageEnabled = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES">
1514
<Testables>
1615
<TestableReference
1716
skipped = "NO">
@@ -23,21 +22,9 @@
2322
ReferencedContainer = "container:">
2423
</BuildableReference>
2524
<SkippedTests>
26-
<Test
27-
Identifier = "BasicIntegrationServerTest">
28-
</Test>
2925
<Test
3026
Identifier = "InstanaIntegrationTests">
3127
</Test>
32-
<Test
33-
Identifier = "InstanaURLProtocolIntegrationTests">
34-
</Test>
35-
<Test
36-
Identifier = "IntegrationTestCase">
37-
</Test>
38-
<Test
39-
Identifier = "ReporterIntegrationTests">
40-
</Test>
4128
</SkippedTests>
4229
</TestableReference>
4330
</Testables>

.swiftpm/xcode/xcshareddata/xcschemes/InstanaAgentIntegrationTests.xcscheme renamed to .swiftpm/xcode/xcshareddata/xcschemes/InstanaIntegrationTests.xcscheme

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,8 +10,7 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES"
14-
codeCoverageEnabled = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES">
1514
<Testables>
1615
<TestableReference
1716
skipped = "NO">
@@ -30,14 +29,11 @@
3029
Identifier = "ApplicationNotRespondingMonitorTests">
3130
</Test>
3231
<Test
33-
Identifier = "BasicIntegrationServerTest">
32+
Identifier = "BeaconPerformanceTests">
3433
</Test>
3534
<Test
3635
Identifier = "BeaconTests">
3736
</Test>
38-
<Test
39-
Identifier = "CoreBeaconExtensionsTests">
40-
</Test>
4137
<Test
4238
Identifier = "CoreBeaconFactoryTests">
4339
</Test>
@@ -92,9 +88,15 @@
9288
<Test
9389
Identifier = "InstanaSystemUtilsTests">
9490
</Test>
91+
<Test
92+
Identifier = "InstanaTestCase">
93+
</Test>
9594
<Test
9695
Identifier = "InstanaTests">
9796
</Test>
97+
<Test
98+
Identifier = "InstanaURLProtocolIntegrationTests">
99+
</Test>
98100
<Test
99101
Identifier = "InstanaURLProtocolTests">
100102
</Test>
@@ -107,6 +109,9 @@
107109
<Test
108110
Identifier = "NetworkUtilityTests">
109111
</Test>
112+
<Test
113+
Identifier = "ReporterIntegrationTests">
114+
</Test>
110115
<Test
111116
Identifier = "ReporterRateLimitTests">
112117
</Test>

Changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Changelog
22

33
## 1.1.12
4+
- Improve example project
5+
- Add capability for macOS (AppKit)
46
- Align carrier type and effective connection type with Android and Web
57

68
## 1.1.11 Beta

0 commit comments

Comments
 (0)