Skip to content

Commit d339056

Browse files
brennanbriemcnally
brennan
authored and
briemcnally
committed
Bump Amplitude Dependency to ~> 4.8 (#71)
* DAND-7- Update Amplitude and Segment Analytics. * DAND-7-Update version number and add changelog. * DAND-7- Update Podfile to use frameworks and inherit search_paths for tests to work. Also change podspec to original version * DAND-7-Place back podspec dependency version * Update deps. * Remove changelog update. * Remove beta
1 parent 67397f5 commit d339056

File tree

7 files changed

+65
-72
lines changed

7 files changed

+65
-72
lines changed

‎Example/Podfile‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@ source 'https://github.com/CocoaPods/Specs.git'
44
# use_frameworks!
55

66
target 'Segment-Amplitude_Example' do
7-
pod "Segment-Amplitude", :path => "../"
7+
pod 'Segment-Amplitude', :path => "../"
88
# Used for testing against latest version of Core SDK
99
# pod "Analytics", :path => "../../analytics-ios"
10-
end
11-
12-
target 'Segment-Amplitude_Tests' do
13-
# Do not include Segment-Amplitude here due to using static lib
14-
pod 'Specta'
15-
pod 'Expecta'
16-
pod 'OCMockito'
10+
11+
target 'Segment-Amplitude_Tests' do
12+
inherit! :search_paths
13+
use_frameworks!
14+
# Do not include Segment-Amplitude here due to using static lib
15+
pod 'Specta'
16+
pod 'Expecta'
17+
pod 'OCMockito'
18+
19+
end
1720

1821
end

‎Example/Podfile.lock‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
PODS:
2-
- Amplitude-iOS (4.0.3)
3-
- Analytics (3.6.7)
2+
- Amplitude-iOS (4.8.2)
3+
- Analytics (3.7.0)
44
- Expecta (1.0.6)
5-
- OCHamcrest (7.0.2)
6-
- OCMockito (5.0.1):
5+
- OCHamcrest (7.1.2)
6+
- OCMockito (5.1.2):
77
- OCHamcrest (~> 7.0)
8-
- Segment-Amplitude (1.4.4):
9-
- Amplitude-iOS (~> 4.0)
10-
- Analytics (~> 3.6)
8+
- Segment-Amplitude (3.0.0-beta):
9+
- Amplitude-iOS (~> 4.8.0)
10+
- Analytics (~> 3.7.0)
1111
- Specta (1.0.7)
1212

1313
DEPENDENCIES:
@@ -16,19 +16,28 @@ DEPENDENCIES:
1616
- Segment-Amplitude (from `../`)
1717
- Specta
1818

19+
SPEC REPOS:
20+
https://github.com/CocoaPods/Specs.git:
21+
- Amplitude-iOS
22+
- Analytics
23+
- Expecta
24+
- OCHamcrest
25+
- OCMockito
26+
- Specta
27+
1928
EXTERNAL SOURCES:
2029
Segment-Amplitude:
21-
:path: ../
30+
:path: "../"
2231

2332
SPEC CHECKSUMS:
24-
Amplitude-iOS: d17f387fca4def647ddcd898f0a3fa90b70fbf1c
25-
Analytics: 2c09a50e3478a3a7ced08a22d00c43ba6f7011e6
33+
Amplitude-iOS: 46c8e6e65c49bb1ad1909a9add1a68e1f8562b3f
34+
Analytics: 77fd5fb102a4a5eedafa2c2b0245ceb7b7c15e45
2635
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
27-
OCHamcrest: 706bfbf69a3df55a873bad096014e80e2e8ca93c
28-
OCMockito: 063837a086c058e764fcd23e771089c1759e7197
29-
Segment-Amplitude: 985f1f4e4e4c3b5bfa28c52995e13fd9ed932e5f
36+
OCHamcrest: b284c9592c28c1e4025a8542e67ea41a635d0d73
37+
OCMockito: 51a534e667194e1ecae88c5def301cc8b0ab3cc7
38+
Segment-Amplitude: 91fb5b342e5b30b2a2e37fd135646110933848b2
3039
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
3140

32-
PODFILE CHECKSUM: f3781d85a056f01c90fae0474309638084899ac0
41+
PODFILE CHECKSUM: 1a99221d0493a9b94855666e2ff7f6148cd79203
3342

34-
COCOAPODS: 1.3.1
43+
COCOAPODS: 1.8.4

‎Example/Segment-Amplitude.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10-
3DB505E72F0EA869E36B1D82 /* libPods-Segment-Amplitude_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BF4B75C199F7F1EA723318E /* libPods-Segment-Amplitude_Tests.a */; };
10+
0A0F9075CA69C03594D62A47 /* Pods_Segment_Amplitude_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D499617867A9269C55AA5760 /* Pods_Segment_Amplitude_Tests.framework */; };
1111
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
1212
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
1313
6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
@@ -59,11 +59,11 @@
5959
6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
6060
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
6161
62BD8A715FB8ECF70ECA29BC /* Pods-Segment-Amplitude_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Amplitude_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Segment-Amplitude_Example/Pods-Segment-Amplitude_Example.debug.xcconfig"; sourceTree = "<group>"; };
62-
6BF4B75C199F7F1EA723318E /* libPods-Segment-Amplitude_Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Segment-Amplitude_Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6362
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
6463
91AECAC26A53C35405CA5402 /* Pods-Segment-Amplitude_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Amplitude_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Segment-Amplitude_Example/Pods-Segment-Amplitude_Example.release.xcconfig"; sourceTree = "<group>"; };
6564
97DEF26D0B2C6B8BB484FE4F /* Pods-Segment-Amplitude_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Segment-Amplitude_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Segment-Amplitude_Tests/Pods-Segment-Amplitude_Tests.debug.xcconfig"; sourceTree = "<group>"; };
6665
9EEA123C7A20DF690C5D6E46 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
66+
D499617867A9269C55AA5760 /* Pods_Segment_Amplitude_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Segment_Amplitude_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6767
F26E1DEACA3B4F2A695BCDD1 /* Segment-Amplitude.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = "Segment-Amplitude.podspec"; path = "../Segment-Amplitude.podspec"; sourceTree = "<group>"; };
6868
/* End PBXFileReference section */
6969

@@ -86,7 +86,7 @@
8686
6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
8787
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
8888
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
89-
3DB505E72F0EA869E36B1D82 /* libPods-Segment-Amplitude_Tests.a in Frameworks */,
89+
0A0F9075CA69C03594D62A47 /* Pods_Segment_Amplitude_Tests.framework in Frameworks */,
9090
);
9191
runOnlyForDeploymentPostprocessing = 0;
9292
};
@@ -133,7 +133,7 @@
133133
6003F591195388D20070C39A /* UIKit.framework */,
134134
6003F5AF195388D20070C39A /* XCTest.framework */,
135135
1A31B91CBBB7876EE6D25775 /* libPods-Segment-Amplitude_Example.a */,
136-
6BF4B75C199F7F1EA723318E /* libPods-Segment-Amplitude_Tests.a */,
136+
D499617867A9269C55AA5760 /* Pods_Segment_Amplitude_Tests.framework */,
137137
);
138138
name = Frameworks;
139139
sourceTree = "<group>";
@@ -204,7 +204,6 @@
204204
6003F586195388D20070C39A /* Sources */,
205205
6003F587195388D20070C39A /* Frameworks */,
206206
6003F588195388D20070C39A /* Resources */,
207-
44F0F8958CAFCB485F500ECF /* [CP] Embed Pods Frameworks */,
208207
2400543B82061AF237CF72DA /* [CP] Copy Pods Resources */,
209208
);
210209
buildRules = (
@@ -224,8 +223,7 @@
224223
6003F5AA195388D20070C39A /* Sources */,
225224
6003F5AB195388D20070C39A /* Frameworks */,
226225
6003F5AC195388D20070C39A /* Resources */,
227-
DE78D070576999349BDBA460 /* [CP] Embed Pods Frameworks */,
228-
96CC595E0672096BFEBE21DB /* [CP] Copy Pods Resources */,
226+
52D1EC1170B32E0378FED4E6 /* [CP] Embed Pods Frameworks */,
229227
);
230228
buildRules = (
231229
);
@@ -260,6 +258,7 @@
260258
developmentRegion = English;
261259
hasScannedForEncodings = 0;
262260
knownRegions = (
261+
English,
263262
en,
264263
Base,
265264
);
@@ -302,34 +301,46 @@
302301
files = (
303302
);
304303
inputPaths = (
305-
"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Amplitude_Example/Pods-Segment-Amplitude_Example-resources.sh",
304+
"${PODS_ROOT}/Target Support Files/Pods-Segment-Amplitude_Example/Pods-Segment-Amplitude_Example-resources.sh",
306305
"${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der",
307306
"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der",
308307
"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaCA.der",
309308
"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaDomainValidationCA.der",
310309
);
311310
name = "[CP] Copy Pods Resources";
312311
outputPaths = (
313-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
312+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/api.amplitude.com.der",
313+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoCaLimitedRsaCertificationAuthority.der",
314+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaCA.der",
315+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
314316
);
315317
runOnlyForDeploymentPostprocessing = 0;
316318
shellPath = /bin/sh;
317-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Amplitude_Example/Pods-Segment-Amplitude_Example-resources.sh\"\n";
319+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Segment-Amplitude_Example/Pods-Segment-Amplitude_Example-resources.sh\"\n";
318320
showEnvVarsInLog = 0;
319321
};
320-
44F0F8958CAFCB485F500ECF /* [CP] Embed Pods Frameworks */ = {
322+
52D1EC1170B32E0378FED4E6 /* [CP] Embed Pods Frameworks */ = {
321323
isa = PBXShellScriptBuildPhase;
322324
buildActionMask = 2147483647;
323325
files = (
324326
);
325327
inputPaths = (
328+
"${PODS_ROOT}/Target Support Files/Pods-Segment-Amplitude_Tests/Pods-Segment-Amplitude_Tests-frameworks.sh",
329+
"${BUILT_PRODUCTS_DIR}/Expecta/Expecta.framework",
330+
"${BUILT_PRODUCTS_DIR}/OCHamcrest/OCHamcrest.framework",
331+
"${BUILT_PRODUCTS_DIR}/OCMockito/OCMockito.framework",
332+
"${BUILT_PRODUCTS_DIR}/Specta/Specta.framework",
326333
);
327334
name = "[CP] Embed Pods Frameworks";
328335
outputPaths = (
336+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Expecta.framework",
337+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCHamcrest.framework",
338+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMockito.framework",
339+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Specta.framework",
329340
);
330341
runOnlyForDeploymentPostprocessing = 0;
331342
shellPath = /bin/sh;
332-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Amplitude_Example/Pods-Segment-Amplitude_Example-frameworks.sh\"\n";
343+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Segment-Amplitude_Tests/Pods-Segment-Amplitude_Tests-frameworks.sh\"\n";
333344
showEnvVarsInLog = 0;
334345
};
335346
73CE207BF893B0053AB2A5D4 /* [CP] Check Pods Manifest.lock */ = {
@@ -350,21 +361,6 @@
350361
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
351362
showEnvVarsInLog = 0;
352363
};
353-
96CC595E0672096BFEBE21DB /* [CP] Copy Pods Resources */ = {
354-
isa = PBXShellScriptBuildPhase;
355-
buildActionMask = 2147483647;
356-
files = (
357-
);
358-
inputPaths = (
359-
);
360-
name = "[CP] Copy Pods Resources";
361-
outputPaths = (
362-
);
363-
runOnlyForDeploymentPostprocessing = 0;
364-
shellPath = /bin/sh;
365-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Amplitude_Tests/Pods-Segment-Amplitude_Tests-resources.sh\"\n";
366-
showEnvVarsInLog = 0;
367-
};
368364
978F406FCFBB1C088B5D568B /* [CP] Check Pods Manifest.lock */ = {
369365
isa = PBXShellScriptBuildPhase;
370366
buildActionMask = 2147483647;
@@ -383,21 +379,6 @@
383379
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
384380
showEnvVarsInLog = 0;
385381
};
386-
DE78D070576999349BDBA460 /* [CP] Embed Pods Frameworks */ = {
387-
isa = PBXShellScriptBuildPhase;
388-
buildActionMask = 2147483647;
389-
files = (
390-
);
391-
inputPaths = (
392-
);
393-
name = "[CP] Embed Pods Frameworks";
394-
outputPaths = (
395-
);
396-
runOnlyForDeploymentPostprocessing = 0;
397-
shellPath = /bin/sh;
398-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Amplitude_Tests/Pods-Segment-Amplitude_Tests-frameworks.sh\"\n";
399-
showEnvVarsInLog = 0;
400-
};
401382
/* End PBXShellScriptBuildPhase section */
402383

403384
/* Begin PBXSourcesBuildPhase section */

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014 Segment.io, Inc.
3+
Copyright (c) 2019 Segment.io, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SDK ?= "iphonesimulator"
2-
DESTINATION ?= "platform=iOS Simulator,name=iPhone 7"
2+
DESTINATION ?= "platform=iOS Simulator,name=iPhone 8"
33
PROJECT := Segment-Amplitude
44
XC_ARGS := -scheme $(PROJECT)_Example -workspace Example/$(PROJECT).xcworkspace -sdk $(SDK) -destination $(DESTINATION) ONLY_ACTIVE_ARCH=NO
55

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ WWWWWW||WWWWWW
5151
5252
The MIT License (MIT)
5353
54-
Copyright (c) 2014 Segment, Inc.
54+
Copyright (c) 2019 Segment, Inc.
5555
5656
Permission is hereby granted, free of charge, to any person obtaining a copy
5757
of this software and associated documentation files (the "Software"), to deal

‎Segment-Amplitude.podspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Segment-Amplitude"
3-
s.version = "2.0.1-beta"
3+
s.version = "3.0.0"
44
s.summary = "Amplitude Integration for Segment's analytics-ios library."
55

66
s.description = <<-DESC
@@ -16,11 +16,11 @@ Pod::Spec.new do |s|
1616
s.source = { :git => "https://github.com/segment-integrations/analytics-ios-integration-amplitude.git", :tag => s.version.to_s }
1717
s.social_media_url = 'https://twitter.com/segment'
1818

19-
s.platform = :ios, '7.0'
19+
s.platform = :ios, '8.0'
2020
s.requires_arc = true
2121

2222
s.source_files = 'Pod/Classes/**/*'
2323

24-
s.dependency 'Analytics', '~> 3.6' # support for iOS 7 +
25-
s.dependency 'Amplitude-iOS', '~> 4.0'
24+
s.dependency 'Analytics', '~> 3.7.0'
25+
s.dependency 'Amplitude-iOS', '~> 4.8.0'
2626
end

0 commit comments

Comments
 (0)