Skip to content

Commit d0a1097

Browse files
migs647migs647
authored
Migs647/checkandseeapps2 (#136)
* Added ability to output XCFramework via Build.sh Needed to change build setting in Xcode. Build Library For Distribution needed to be Yes * Updated Xcode for actions to 13.2.1 * Removed unsupported destinations * Removed Flurry from the bridging header
1 parent 675fbe5 commit d0a1097

File tree

6 files changed

+8
-114
lines changed

6 files changed

+8
-114
lines changed

‎.github/workflows/swift.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
steps:
5353
- uses: maxim-lobanov/setup-xcode@v1
5454
with:
55-
xcode-version: '13.0'
55+
xcode-version: '13.2.1'
5656
- uses: actions/checkout@v2
5757
- uses: actions/cache@v2
5858
with:
@@ -72,7 +72,7 @@ jobs:
7272
steps:
7373
- uses: maxim-lobanov/setup-xcode@v1
7474
with:
75-
xcode-version: '13.0'
75+
xcode-version: '13.2.1'
7676
- uses: actions/checkout@v2
7777
- uses: actions/cache@v2
7878
with:
@@ -91,7 +91,7 @@ jobs:
9191
steps:
9292
- uses: maxim-lobanov/setup-xcode@v1
9393
with:
94-
xcode-version: '13.0'
94+
xcode-version: '13.2.1'
9595
- uses: actions/checkout@v2
9696
- uses: actions/cache@v2
9797
with:
@@ -110,7 +110,7 @@ jobs:
110110
steps:
111111
- uses: maxim-lobanov/setup-xcode@v1
112112
with:
113-
xcode-version: '13.0'
113+
xcode-version: '13.2.1'
114114
- uses: actions/checkout@v2
115115
- uses: actions/cache@v2
116116
with:
@@ -145,7 +145,7 @@ jobs:
145145
steps:
146146
- uses: maxim-lobanov/setup-xcode@v1
147147
with:
148-
xcode-version: '13.0'
148+
xcode-version: '13.2.1'
149149
- uses: actions/checkout@v2
150150
- uses: actions/cache@v2
151151
with:

‎Examples/apps/DestinationsExample/DestinationsExample.xcodeproj/project.pbxproj

-97
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
468DE06B27D28CB200F2D94B /* SegmentFacebook in Frameworks */ = {isa = PBXBuildFile; productRef = 468DE06A27D28CB200F2D94B /* SegmentFacebook */; };
1818
468DE06E27D28D1300F2D94B /* SegmentFirebase in Frameworks */ = {isa = PBXBuildFile; productRef = 468DE06D27D28D1300F2D94B /* SegmentFirebase */; };
1919
468DE07127D28D4700F2D94B /* SegmentMixpanel in Frameworks */ = {isa = PBXBuildFile; productRef = 468DE07027D28D4700F2D94B /* SegmentMixpanel */; };
20-
4694D2F627B58C9600D110C0 /* FlurryAnalyticsSPM in Frameworks */ = {isa = PBXBuildFile; productRef = 4694D2F527B58C9600D110C0 /* FlurryAnalyticsSPM */; };
21-
4694D2F927B58E5E00D110C0 /* ComScore in Frameworks */ = {isa = PBXBuildFile; productRef = 4694D2F827B58E5E00D110C0 /* ComScore */; };
22-
4694D2FF27B5914200D110C0 /* Intercom in Frameworks */ = {isa = PBXBuildFile; productRef = 4694D2FE27B5914200D110C0 /* Intercom */; };
2320
469EC8D0266066130068F9E3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 469EC8CF266066130068F9E3 /* SystemConfiguration.framework */; };
2421
469F7B08266011690038E773 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 469F7B07266011690038E773 /* AppDelegate.swift */; };
2522
469F7B0A266011690038E773 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 469F7B09266011690038E773 /* SceneDelegate.swift */; };
@@ -28,14 +25,8 @@
2825
469F7B112660116A0038E773 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 469F7B102660116A0038E773 /* Assets.xcassets */; };
2926
469F7B142660116A0038E773 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 469F7B122660116A0038E773 /* LaunchScreen.storyboard */; };
3027
469F7B1D266011D70038E773 /* Segment in Frameworks */ = {isa = PBXBuildFile; productRef = 469F7B1C266011D70038E773 /* Segment */; };
31-
469F7B20266012CB0038E773 /* FlurryDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 469F7B1F266012CB0038E773 /* FlurryDestination.swift */; };
32-
469F7B23266013100038E773 /* Adjust in Frameworks */ = {isa = PBXBuildFile; productRef = 469F7B22266013100038E773 /* Adjust */; };
33-
469F7B25266013320038E773 /* AdjustDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 469F7B24266013320038E773 /* AdjustDestination.swift */; };
34-
96469A9B270279A600AC5772 /* IntercomDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96469A9A270279A600AC5772 /* IntercomDestination.swift */; };
3528
965DC1262671656C00DDF9C7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 965DC1252671656C00DDF9C7 /* GoogleService-Info.plist */; };
3629
9697C1F52679156C00B87EC1 /* Segment_Logo_Avatar_Grey-1024.png in Resources */ = {isa = PBXBuildFile; fileRef = 9697C1F42679156C00B87EC1 /* Segment_Logo_Avatar_Grey-1024.png */; };
37-
96D8F16F26EFFA09007F8B28 /* ExampleDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96D8F16E26EFFA09007F8B28 /* ExampleDestination.swift */; };
38-
96DBF37D26FA943300724B0B /* ComscoreDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DBF37C26FA943300724B0B /* ComscoreDestination.swift */; };
3930
/* End PBXBuildFile section */
4031

4132
/* Begin PBXFileReference section */
@@ -54,13 +45,8 @@
5445
469F7B102660116A0038E773 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5546
469F7B132660116A0038E773 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5647
469F7B152660116A0038E773 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
57-
469F7B1F266012CB0038E773 /* FlurryDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlurryDestination.swift; sourceTree = "<group>"; };
58-
469F7B24266013320038E773 /* AdjustDestination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdjustDestination.swift; sourceTree = "<group>"; };
59-
96469A9A270279A600AC5772 /* IntercomDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntercomDestination.swift; sourceTree = "<group>"; };
6048
965DC1252671656C00DDF9C7 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
6149
9697C1F42679156C00B87EC1 /* Segment_Logo_Avatar_Grey-1024.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Segment_Logo_Avatar_Grey-1024.png"; sourceTree = "<group>"; };
62-
96D8F16E26EFFA09007F8B28 /* ExampleDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleDestination.swift; sourceTree = "<group>"; };
63-
96DBF37C26FA943300724B0B /* ComscoreDestination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComscoreDestination.swift; sourceTree = "<group>"; };
6450
BA384C9D2686609000AFEA1B /* DestinationsExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DestinationsExample.entitlements; sourceTree = "<group>"; };
6551
/* End PBXFileReference section */
6652

@@ -73,13 +59,9 @@
7359
468DE06E27D28D1300F2D94B /* SegmentFirebase in Frameworks */,
7460
469EC8D0266066130068F9E3 /* SystemConfiguration.framework in Frameworks */,
7561
468DE06827D28C7E00F2D94B /* SegmentAppsFlyer in Frameworks */,
76-
4694D2F627B58C9600D110C0 /* FlurryAnalyticsSPM in Frameworks */,
7762
468DE07127D28D4700F2D94B /* SegmentMixpanel in Frameworks */,
78-
4694D2F927B58E5E00D110C0 /* ComScore in Frameworks */,
7963
469F7B1D266011D70038E773 /* Segment in Frameworks */,
8064
468DE06527D28C6500F2D94B /* SegmentAmplitude in Frameworks */,
81-
4694D2FF27B5914200D110C0 /* Intercom in Frameworks */,
82-
469F7B23266013100038E773 /* Adjust in Frameworks */,
8365
);
8466
runOnlyForDeploymentPostprocessing = 0;
8567
};
@@ -121,7 +103,6 @@
121103
children = (
122104
BA384C9D2686609000AFEA1B /* DestinationsExample.entitlements */,
123105
4687168C270E16080028B595 /* other_plugins */,
124-
469F7B1E266012CB0038E773 /* destination_plugins */,
125106
469F7B07266011690038E773 /* AppDelegate.swift */,
126107
469F7B09266011690038E773 /* SceneDelegate.swift */,
127108
469F7B0B266011690038E773 /* ViewController.swift */,
@@ -143,19 +124,6 @@
143124
name = Frameworks;
144125
sourceTree = "<group>";
145126
};
146-
469F7B1E266012CB0038E773 /* destination_plugins */ = {
147-
isa = PBXGroup;
148-
children = (
149-
469F7B24266013320038E773 /* AdjustDestination.swift */,
150-
96DBF37C26FA943300724B0B /* ComscoreDestination.swift */,
151-
96D8F16E26EFFA09007F8B28 /* ExampleDestination.swift */,
152-
469F7B1F266012CB0038E773 /* FlurryDestination.swift */,
153-
96469A9A270279A600AC5772 /* IntercomDestination.swift */,
154-
);
155-
name = destination_plugins;
156-
path = ../../../destination_plugins;
157-
sourceTree = "<group>";
158-
};
159127
965DC1242671655700DDF9C7 /* Resources */ = {
160128
isa = PBXGroup;
161129
children = (
@@ -183,10 +151,6 @@
183151
name = DestinationsExample;
184152
packageProductDependencies = (
185153
469F7B1C266011D70038E773 /* Segment */,
186-
469F7B22266013100038E773 /* Adjust */,
187-
4694D2F527B58C9600D110C0 /* FlurryAnalyticsSPM */,
188-
4694D2F827B58E5E00D110C0 /* ComScore */,
189-
4694D2FE27B5914200D110C0 /* Intercom */,
190154
468DE06427D28C6500F2D94B /* SegmentAmplitude */,
191155
468DE06727D28C7E00F2D94B /* SegmentAppsFlyer */,
192156
468DE06A27D28CB200F2D94B /* SegmentFacebook */,
@@ -221,10 +185,6 @@
221185
);
222186
mainGroup = 469F7AFB266011690038E773;
223187
packageReferences = (
224-
469F7B21266013100038E773 /* XCRemoteSwiftPackageReference "ios_sdk" */,
225-
4694D2F427B58C9500D110C0 /* XCRemoteSwiftPackageReference "FlurrySwiftPackage" */,
226-
4694D2F727B58E5E00D110C0 /* XCRemoteSwiftPackageReference "comscore-swift-package-manager" */,
227-
4694D2FD27B5914200D110C0 /* XCRemoteSwiftPackageReference "intercom-ios" */,
228188
468DE06327D28C6500F2D94B /* XCRemoteSwiftPackageReference "analytics-swift-amplitude" */,
229189
468DE06627D28C7E00F2D94B /* XCRemoteSwiftPackageReference "analytics-swift-appsflyer" */,
230190
468DE06927D28CB200F2D94B /* XCRemoteSwiftPackageReference "analytics-swift-facebook-app-events" */,
@@ -261,14 +221,9 @@
261221
buildActionMask = 2147483647;
262222
files = (
263223
46871698270E16080028B595 /* ConsoleLogger.swift in Sources */,
264-
469F7B20266012CB0038E773 /* FlurryDestination.swift in Sources */,
265224
469F7B0C266011690038E773 /* ViewController.swift in Sources */,
266-
96469A9B270279A600AC5772 /* IntercomDestination.swift in Sources */,
267-
96D8F16F26EFFA09007F8B28 /* ExampleDestination.swift in Sources */,
268-
96DBF37D26FA943300724B0B /* ComscoreDestination.swift in Sources */,
269225
469F7B08266011690038E773 /* AppDelegate.swift in Sources */,
270226
46871694270E16080028B595 /* NotificationTracking.swift in Sources */,
271-
469F7B25266013320038E773 /* AdjustDestination.swift in Sources */,
272227
469F7B0A266011690038E773 /* SceneDelegate.swift in Sources */,
273228
46871695270E16080028B595 /* UIKitScreenTracking.swift in Sources */,
274229
46871696270E16080028B595 /* ConsentTracking.swift in Sources */,
@@ -524,38 +479,6 @@
524479
minimumVersion = 1.1.3;
525480
};
526481
};
527-
4694D2F427B58C9500D110C0 /* XCRemoteSwiftPackageReference "FlurrySwiftPackage" */ = {
528-
isa = XCRemoteSwiftPackageReference;
529-
repositoryURL = "https://github.com/flurry/FlurrySwiftPackage";
530-
requirement = {
531-
kind = upToNextMajorVersion;
532-
minimumVersion = 11.0.0;
533-
};
534-
};
535-
4694D2F727B58E5E00D110C0 /* XCRemoteSwiftPackageReference "comscore-swift-package-manager" */ = {
536-
isa = XCRemoteSwiftPackageReference;
537-
repositoryURL = "https://github.com/comscore/comscore-swift-package-manager";
538-
requirement = {
539-
kind = upToNextMajorVersion;
540-
minimumVersion = 6.9.0;
541-
};
542-
};
543-
4694D2FD27B5914200D110C0 /* XCRemoteSwiftPackageReference "intercom-ios" */ = {
544-
isa = XCRemoteSwiftPackageReference;
545-
repositoryURL = "https://github.com/intercom/intercom-ios";
546-
requirement = {
547-
kind = upToNextMajorVersion;
548-
minimumVersion = 11.1.2;
549-
};
550-
};
551-
469F7B21266013100038E773 /* XCRemoteSwiftPackageReference "ios_sdk" */ = {
552-
isa = XCRemoteSwiftPackageReference;
553-
repositoryURL = "https://github.com/adjust/ios_sdk.git";
554-
requirement = {
555-
kind = upToNextMajorVersion;
556-
minimumVersion = 4.29.6;
557-
};
558-
};
559482
/* End XCRemoteSwiftPackageReference section */
560483

561484
/* Begin XCSwiftPackageProductDependency section */
@@ -584,30 +507,10 @@
584507
package = 468DE06F27D28D4700F2D94B /* XCRemoteSwiftPackageReference "analytics-swift-mixpanel" */;
585508
productName = SegmentMixpanel;
586509
};
587-
4694D2F527B58C9600D110C0 /* FlurryAnalyticsSPM */ = {
588-
isa = XCSwiftPackageProductDependency;
589-
package = 4694D2F427B58C9500D110C0 /* XCRemoteSwiftPackageReference "FlurrySwiftPackage" */;
590-
productName = FlurryAnalyticsSPM;
591-
};
592-
4694D2F827B58E5E00D110C0 /* ComScore */ = {
593-
isa = XCSwiftPackageProductDependency;
594-
package = 4694D2F727B58E5E00D110C0 /* XCRemoteSwiftPackageReference "comscore-swift-package-manager" */;
595-
productName = ComScore;
596-
};
597-
4694D2FE27B5914200D110C0 /* Intercom */ = {
598-
isa = XCSwiftPackageProductDependency;
599-
package = 4694D2FD27B5914200D110C0 /* XCRemoteSwiftPackageReference "intercom-ios" */;
600-
productName = Intercom;
601-
};
602510
469F7B1C266011D70038E773 /* Segment */ = {
603511
isa = XCSwiftPackageProductDependency;
604512
productName = Segment;
605513
};
606-
469F7B22266013100038E773 /* Adjust */ = {
607-
isa = XCSwiftPackageProductDependency;
608-
package = 469F7B21266013100038E773 /* XCRemoteSwiftPackageReference "ios_sdk" */;
609-
productName = Adjust;
610-
};
611514
/* End XCSwiftPackageProductDependency section */
612515
};
613516
rootObject = 469F7AFC266011690038E773 /* Project object */;

‎Examples/apps/DestinationsExample/DestinationsExample/AppDelegate.swift

-9
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2828

2929
analytics = Analytics(configuration: configuration)
3030

31-
// Add Adjust destination plugin
32-
analytics?.add(plugin: AdjustDestination())
33-
3431
// Add Amplitude session plugin
3532
analytics?.add(plugin: AmplitudeSession())
3633

3734
// Add Mixpanel destination plugin
3835
analytics?.add(plugin: MixpanelDestination())
3936

40-
// Add Flurry destination plugin
41-
analytics?.add(plugin: FlurryDestination())
42-
4337
// Add the Firebase destination plugin
4438
analytics?.add(plugin: FirebaseDestination())
4539

4640
// Add the AppsFlyer destination plugin
4741
analytics?.add(plugin: AppsFlyerDestination())
4842

49-
// Add the Comscore destination plugin
50-
analytics?.add(plugin: ComscoreDestination())
51-
5243
// Add the Facebook App Events plugin
5344
analytics?.add(plugin: FacebookAppEventsDestination())
5445

‎Examples/apps/DestinationsExample/DestinationsExample/DestinationsExample-Bridging-Header.h

-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@
88
#ifndef DestinationsExample_Bridging_Header_h
99
#define DestinationsExample_Bridging_Header_h
1010

11-
#import "Flurry.h"
12-
1311
#endif /* DestinationsExample_Bridging_Header_h */

‎Examples/destination_plugins/FlurryDestination.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import Foundation
3838
import Segment
39-
import FlurryAnalytics
39+
import Flurry
4040

4141
/**
4242
An implementation of the Flurry Analytics device mode destination as a plugin.

‎Segment.xcodeproj/project.pbxproj

+2
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,7 @@
631631
OBJ_20 /* Debug */ = {
632632
isa = XCBuildConfiguration;
633633
buildSettings = {
634+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
634635
ENABLE_TESTABILITY = YES;
635636
FRAMEWORK_SEARCH_PATHS = (
636637
"$(inherited)",
@@ -660,6 +661,7 @@
660661
OBJ_21 /* Release */ = {
661662
isa = XCBuildConfiguration;
662663
buildSettings = {
664+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
663665
ENABLE_TESTABILITY = YES;
664666
FRAMEWORK_SEARCH_PATHS = (
665667
"$(inherited)",

0 commit comments

Comments
 (0)