Skip to content

Commit a6f1559

Browse files
crleonacrleona
authored
fix: better carthage support (#142)
1 parent 9adaced commit a6f1559

File tree

3 files changed

+73
-36
lines changed

3 files changed

+73
-36
lines changed

‎Amplitude-Swift.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
OBJ_156 /* HttpClientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_72 /* HttpClientTests.swift */; };
113113
OBJ_157 /* PersistentStorageResponseHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_73 /* PersistentStorageResponseHandlerTests.swift */; };
114114
OBJ_158 /* UrlExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_74 /* UrlExtensionTests.swift */; };
115-
OBJ_160 /* Amplitude_Swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "amplitude-swift::Amplitude-Swift::Product" /* Amplitude_Swift.framework */; };
115+
OBJ_160 /* AmplitudeSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "amplitude-swift::Amplitude-Swift::Product" /* AmplitudeSwift.framework */; };
116116
OBJ_88 /* Amplitude.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_8 /* Amplitude.swift */; };
117117
OBJ_89 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* Configuration.swift */; };
118118
OBJ_90 /* ConsoleLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* ConsoleLogger.swift */; };
@@ -253,7 +253,7 @@
253253
OBJ_81 /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
254254
OBJ_82 /* AmplitudeSwift.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = AmplitudeSwift.podspec; sourceTree = "<group>"; };
255255
OBJ_9 /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
256-
"amplitude-swift::Amplitude-Swift::Product" /* Amplitude_Swift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Amplitude_Swift.framework; path = AmplitudeSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
256+
"amplitude-swift::Amplitude-Swift::Product" /* AmplitudeSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AmplitudeSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
257257
"amplitude-swift::Amplitude-SwiftTests::Product" /* Amplitude_SwiftTests.xctest */ = {isa = PBXFileReference; lastKnownFileType = file; name = Amplitude_SwiftTests.xctest; path = "Amplitude-SwiftTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
258258
/* End PBXFileReference section */
259259

@@ -270,7 +270,7 @@
270270
isa = PBXFrameworksBuildPhase;
271271
buildActionMask = 0;
272272
files = (
273-
OBJ_160 /* Amplitude_Swift.framework in Frameworks */,
273+
OBJ_160 /* AmplitudeSwift.framework in Frameworks */,
274274
);
275275
runOnlyForDeploymentPostprocessing = 0;
276276
};
@@ -541,7 +541,7 @@
541541
OBJ_75 /* Products */ = {
542542
isa = PBXGroup;
543543
children = (
544-
"amplitude-swift::Amplitude-Swift::Product" /* Amplitude_Swift.framework */,
544+
"amplitude-swift::Amplitude-Swift::Product" /* AmplitudeSwift.framework */,
545545
"amplitude-swift::Amplitude-SwiftTests::Product" /* Amplitude_SwiftTests.xctest */,
546546
);
547547
name = Products;
@@ -567,7 +567,7 @@
567567
BA34B23B2AA0723A00F88097 /* AnalyticsConnector */,
568568
);
569569
productName = Amplitude_Swift;
570-
productReference = "amplitude-swift::Amplitude-Swift::Product" /* Amplitude_Swift.framework */;
570+
productReference = "amplitude-swift::Amplitude-Swift::Product" /* AmplitudeSwift.framework */;
571571
productType = "com.apple.product-type.framework";
572572
};
573573
"amplitude-swift::Amplitude-SwiftTests" /* Amplitude-SwiftTests */ = {
@@ -954,6 +954,7 @@
954954
isa = XCBuildConfiguration;
955955
buildSettings = {
956956
CURRENT_PROJECT_VERSION = 1;
957+
DEFINES_MODULE = YES;
957958
DRIVERKIT_DEPLOYMENT_TARGET = 19.0;
958959
ENABLE_TESTABILITY = YES;
959960
FRAMEWORK_SEARCH_PATHS = (
@@ -991,6 +992,7 @@
991992
isa = XCBuildConfiguration;
992993
buildSettings = {
993994
CURRENT_PROJECT_VERSION = 1;
995+
DEFINES_MODULE = YES;
994996
DRIVERKIT_DEPLOYMENT_TARGET = 19.0;
995997
ENABLE_TESTABILITY = YES;
996998
FRAMEWORK_SEARCH_PATHS = (

‎Cartfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "amplitude/analytics-connector-ios" ~> 1.0.0

‎Examples/AmplitudeObjCExample/AmplitudeObjCExample.xcodeproj/project.pbxproj‎

Lines changed: 65 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
4E890A202BAB82DF00B3F736 /* Amplitude_Swift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E890A142BAB814A00B3F736 /* Amplitude_Swift.framework */; };
1011
BA2E1DA42AC1EA220074E74F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BA2E1DA32AC1EA220074E74F /* AppDelegate.m */; };
1112
BA2E1DA72AC1EA220074E74F /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BA2E1DA62AC1EA220074E74F /* SceneDelegate.m */; };
1213
BA2E1DAA2AC1EA220074E74F /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BA2E1DA92AC1EA220074E74F /* ViewController.m */; };
@@ -15,11 +16,30 @@
1516
BA2E1DB22AC1EA230074E74F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BA2E1DB02AC1EA230074E74F /* LaunchScreen.storyboard */; };
1617
BA2E1DB52AC1EA230074E74F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BA2E1DB42AC1EA230074E74F /* main.m */; };
1718
BA2E1DBF2AC1EA240074E74F /* AmplitudeObjCExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BA2E1DBE2AC1EA240074E74F /* AmplitudeObjCExampleTests.m */; };
18-
BA2E1DDE2AC1F1CA0074E74F /* AmplitudeSwift in Frameworks */ = {isa = PBXBuildFile; productRef = BA2E1DDD2AC1F1CA0074E74F /* AmplitudeSwift */; };
19-
BAB79A442AC3042200F191C9 /* AmplitudeSwift in Frameworks */ = {isa = PBXBuildFile; productRef = BAB79A432AC3042200F191C9 /* AmplitudeSwift */; };
2019
/* End PBXBuildFile section */
2120

2221
/* Begin PBXContainerItemProxy section */
22+
4E890A132BAB814A00B3F736 /* PBXContainerItemProxy */ = {
23+
isa = PBXContainerItemProxy;
24+
containerPortal = 4E890A0C2BAB814A00B3F736 /* Amplitude-Swift.xcodeproj */;
25+
proxyType = 2;
26+
remoteGlobalIDString = "amplitude-swift::Amplitude-Swift::Product";
27+
remoteInfo = "Amplitude-Swift";
28+
};
29+
4E890A152BAB814A00B3F736 /* PBXContainerItemProxy */ = {
30+
isa = PBXContainerItemProxy;
31+
containerPortal = 4E890A0C2BAB814A00B3F736 /* Amplitude-Swift.xcodeproj */;
32+
proxyType = 2;
33+
remoteGlobalIDString = "amplitude-swift::Amplitude-SwiftTests::Product";
34+
remoteInfo = "Amplitude-SwiftTests";
35+
};
36+
4E890A192BAB826900B3F736 /* PBXContainerItemProxy */ = {
37+
isa = PBXContainerItemProxy;
38+
containerPortal = 4E890A0C2BAB814A00B3F736 /* Amplitude-Swift.xcodeproj */;
39+
proxyType = 1;
40+
remoteGlobalIDString = "amplitude-swift::Amplitude-Swift";
41+
remoteInfo = "Amplitude-Swift";
42+
};
2343
BA2E1DBB2AC1EA230074E74F /* PBXContainerItemProxy */ = {
2444
isa = PBXContainerItemProxy;
2545
containerPortal = BA2E1D972AC1EA220074E74F /* Project object */;
@@ -30,6 +50,7 @@
3050
/* End PBXContainerItemProxy section */
3151

3252
/* Begin PBXFileReference section */
53+
4E890A0C2BAB814A00B3F736 /* Amplitude-Swift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Amplitude-Swift.xcodeproj"; path = "../../Amplitude-Swift.xcodeproj"; sourceTree = "<group>"; };
3354
BA2E1D9F2AC1EA220074E74F /* AmplitudeObjCExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AmplitudeObjCExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
3455
BA2E1DA22AC1EA220074E74F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
3556
BA2E1DA32AC1EA220074E74F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -51,24 +72,33 @@
5172
isa = PBXFrameworksBuildPhase;
5273
buildActionMask = 2147483647;
5374
files = (
54-
BA2E1DDE2AC1F1CA0074E74F /* AmplitudeSwift in Frameworks */,
75+
4E890A202BAB82DF00B3F736 /* Amplitude_Swift.framework in Frameworks */,
5576
);
5677
runOnlyForDeploymentPostprocessing = 0;
5778
};
5879
BA2E1DB72AC1EA230074E74F /* Frameworks */ = {
5980
isa = PBXFrameworksBuildPhase;
6081
buildActionMask = 2147483647;
6182
files = (
62-
BAB79A442AC3042200F191C9 /* AmplitudeSwift in Frameworks */,
6383
);
6484
runOnlyForDeploymentPostprocessing = 0;
6585
};
6686
/* End PBXFrameworksBuildPhase section */
6787

6888
/* Begin PBXGroup section */
89+
4E890A0D2BAB814A00B3F736 /* Products */ = {
90+
isa = PBXGroup;
91+
children = (
92+
4E890A142BAB814A00B3F736 /* Amplitude_Swift.framework */,
93+
4E890A162BAB814A00B3F736 /* Amplitude_SwiftTests.xctest */,
94+
);
95+
name = Products;
96+
sourceTree = "<group>";
97+
};
6998
BA2E1D962AC1EA220074E74F = {
7099
isa = PBXGroup;
71100
children = (
101+
4E890A0C2BAB814A00B3F736 /* Amplitude-Swift.xcodeproj */,
72102
BA2E1DA12AC1EA220074E74F /* AmplitudeObjCExample */,
73103
BA2E1DBD2AC1EA240074E74F /* AmplitudeObjCExampleTests */,
74104
BA2E1DA02AC1EA220074E74F /* Products */,
@@ -132,10 +162,10 @@
132162
buildRules = (
133163
);
134164
dependencies = (
165+
4E890A1A2BAB826900B3F736 /* PBXTargetDependency */,
135166
);
136167
name = AmplitudeObjCExample;
137168
packageProductDependencies = (
138-
BA2E1DDD2AC1F1CA0074E74F /* AmplitudeSwift */,
139169
);
140170
productName = AmplitudeObjCExample;
141171
productReference = BA2E1D9F2AC1EA220074E74F /* AmplitudeObjCExample.app */;
@@ -156,7 +186,6 @@
156186
);
157187
name = AmplitudeObjCExampleTests;
158188
packageProductDependencies = (
159-
BAB79A432AC3042200F191C9 /* AmplitudeSwift */,
160189
);
161190
productName = AmplitudeObjCExampleTests;
162191
productReference = BA2E1DBA2AC1EA230074E74F /* AmplitudeObjCExampleTests.xctest */;
@@ -190,10 +219,15 @@
190219
);
191220
mainGroup = BA2E1D962AC1EA220074E74F;
192221
packageReferences = (
193-
BA2E1DDC2AC1F1CA0074E74F /* XCRemoteSwiftPackageReference "Amplitude-Swift" */,
194222
);
195223
productRefGroup = BA2E1DA02AC1EA220074E74F /* Products */;
196224
projectDirPath = "";
225+
projectReferences = (
226+
{
227+
ProductGroup = 4E890A0D2BAB814A00B3F736 /* Products */;
228+
ProjectRef = 4E890A0C2BAB814A00B3F736 /* Amplitude-Swift.xcodeproj */;
229+
},
230+
);
197231
projectRoot = "";
198232
targets = (
199233
BA2E1D9E2AC1EA220074E74F /* AmplitudeObjCExample */,
@@ -202,6 +236,25 @@
202236
};
203237
/* End PBXProject section */
204238

239+
/* Begin PBXReferenceProxy section */
240+
4E890A142BAB814A00B3F736 /* Amplitude_Swift.framework */ = {
241+
isa = PBXReferenceProxy;
242+
fileType = wrapper.framework;
243+
name = Amplitude_Swift.framework;
244+
path = AmplitudeSwift.framework;
245+
remoteRef = 4E890A132BAB814A00B3F736 /* PBXContainerItemProxy */;
246+
sourceTree = BUILT_PRODUCTS_DIR;
247+
};
248+
4E890A162BAB814A00B3F736 /* Amplitude_SwiftTests.xctest */ = {
249+
isa = PBXReferenceProxy;
250+
fileType = file;
251+
name = Amplitude_SwiftTests.xctest;
252+
path = "Amplitude-SwiftTests.xctest";
253+
remoteRef = 4E890A152BAB814A00B3F736 /* PBXContainerItemProxy */;
254+
sourceTree = BUILT_PRODUCTS_DIR;
255+
};
256+
/* End PBXReferenceProxy section */
257+
205258
/* Begin PBXResourcesBuildPhase section */
206259
BA2E1D9D2AC1EA220074E74F /* Resources */ = {
207260
isa = PBXResourcesBuildPhase;
@@ -245,6 +298,11 @@
245298
/* End PBXSourcesBuildPhase section */
246299

247300
/* Begin PBXTargetDependency section */
301+
4E890A1A2BAB826900B3F736 /* PBXTargetDependency */ = {
302+
isa = PBXTargetDependency;
303+
name = "Amplitude-Swift";
304+
targetProxy = 4E890A192BAB826900B3F736 /* PBXContainerItemProxy */;
305+
};
248306
BA2E1DBC2AC1EA230074E74F /* PBXTargetDependency */ = {
249307
isa = PBXTargetDependency;
250308
target = BA2E1D9E2AC1EA220074E74F /* AmplitudeObjCExample */;
@@ -499,30 +557,6 @@
499557
defaultConfigurationName = Release;
500558
};
501559
/* End XCConfigurationList section */
502-
503-
/* Begin XCRemoteSwiftPackageReference section */
504-
BA2E1DDC2AC1F1CA0074E74F /* XCRemoteSwiftPackageReference "Amplitude-Swift" */ = {
505-
isa = XCRemoteSwiftPackageReference;
506-
repositoryURL = "../../../Amplitude-Swift";
507-
requirement = {
508-
branch = HEAD;
509-
kind = branch;
510-
};
511-
};
512-
/* End XCRemoteSwiftPackageReference section */
513-
514-
/* Begin XCSwiftPackageProductDependency section */
515-
BA2E1DDD2AC1F1CA0074E74F /* AmplitudeSwift */ = {
516-
isa = XCSwiftPackageProductDependency;
517-
package = BA2E1DDC2AC1F1CA0074E74F /* XCRemoteSwiftPackageReference "Amplitude-Swift" */;
518-
productName = AmplitudeSwift;
519-
};
520-
BAB79A432AC3042200F191C9 /* AmplitudeSwift */ = {
521-
isa = XCSwiftPackageProductDependency;
522-
package = BA2E1DDC2AC1F1CA0074E74F /* XCRemoteSwiftPackageReference "Amplitude-Swift" */;
523-
productName = AmplitudeSwift;
524-
};
525-
/* End XCSwiftPackageProductDependency section */
526560
};
527561
rootObject = BA2E1D972AC1EA220074E74F /* Project object */;
528562
}

0 commit comments

Comments
 (0)