Skip to content

Commit 805ad23

Browse files
thejohnlimathejohnlima
committed
Adjust demo project
1 parent c176611 commit 805ad23

File tree

11 files changed

+56
-171
lines changed

11 files changed

+56
-171
lines changed

‎FADemo/Podfile.lock‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,11 @@ PODS:
5151
- nanopb/encode (0.3.901)
5252

5353
DEPENDENCIES:
54-
- BaseTracking (~> 1.0)
54+
- BaseTracking (from `https://github.com/limadeveloper/BaseTracking.git`, branch `master`)
5555
- Firebase/Core
5656

5757
SPEC REPOS:
5858
https://github.com/cocoapods/specs.git:
59-
- BaseTracking
6059
- Firebase
6160
- FirebaseAnalytics
6261
- FirebaseCore
@@ -65,6 +64,16 @@ SPEC REPOS:
6564
- GoogleUtilities
6665
- nanopb
6766

67+
EXTERNAL SOURCES:
68+
BaseTracking:
69+
:branch: master
70+
:git: https://github.com/limadeveloper/BaseTracking.git
71+
72+
CHECKOUT OPTIONS:
73+
BaseTracking:
74+
:commit: c17661138380e931536363a4639deb43d438dbdf
75+
:git: https://github.com/limadeveloper/BaseTracking.git
76+
6877
SPEC CHECKSUMS:
6978
BaseTracking: b9891022ec029b16109ef63ec5c9ebb4379717b3
7079
Firebase: 02f3281965c075426141a0ce1277e9de6649cab9
@@ -75,6 +84,6 @@ SPEC CHECKSUMS:
7584
GoogleUtilities: 111a012f4c3a29c9e7c954c082fafd6ee3c999c0
7685
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
7786

78-
PODFILE CHECKSUM: a5e2b59271076398640bd27b7a25d0c9b3415a8e
87+
PODFILE CHECKSUM: 0f5cfa852cbf93da4d36f1f663d5193c43e48ab6
7988

8089
COCOAPODS: 1.6.1

‎Framework/BaseTracking/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0.0</string>
18+
<string>1.0.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
</dict>

‎GADemo/GADemo.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10-
528D7E842239AADD00202F68 /* CustomRawRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528D7E802239AADD00202F68 /* CustomRawRepresentable.swift */; };
11-
528D7E852239AADD00202F68 /* BaseTrackingEventLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528D7E812239AADD00202F68 /* BaseTrackingEventLog.swift */; };
12-
528D7E862239AADD00202F68 /* BaseTrackingEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528D7E822239AADD00202F68 /* BaseTrackingEvent.swift */; };
13-
528D7E872239AADD00202F68 /* BaseTrackingProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528D7E832239AADD00202F68 /* BaseTrackingProtocol.swift */; };
1410
528D7E892239AB7A00202F68 /* TrackingManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528D7E882239AB7A00202F68 /* TrackingManager.swift */; };
1511
528D7E8C2239B54F00202F68 /* HomeTracking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 528D7E8B2239B54F00202F68 /* HomeTracking.swift */; };
1612
52AB664A2239A828006D4A92 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52AB66492239A828006D4A92 /* AppDelegate.swift */; };
@@ -22,10 +18,6 @@
2218
/* End PBXBuildFile section */
2319

2420
/* Begin PBXFileReference section */
25-
528D7E802239AADD00202F68 /* CustomRawRepresentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomRawRepresentable.swift; sourceTree = "<group>"; };
26-
528D7E812239AADD00202F68 /* BaseTrackingEventLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTrackingEventLog.swift; sourceTree = "<group>"; };
27-
528D7E822239AADD00202F68 /* BaseTrackingEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTrackingEvent.swift; sourceTree = "<group>"; };
28-
528D7E832239AADD00202F68 /* BaseTrackingProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTrackingProtocol.swift; sourceTree = "<group>"; };
2921
528D7E882239AB7A00202F68 /* TrackingManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackingManager.swift; sourceTree = "<group>"; };
3022
528D7E8A2239ADF200202F68 /* BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = "<group>"; };
3123
528D7E8B2239B54F00202F68 /* HomeTracking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTracking.swift; sourceTree = "<group>"; };
@@ -53,17 +45,6 @@
5345
/* End PBXFrameworksBuildPhase section */
5446

5547
/* Begin PBXGroup section */
56-
528D7E7F2239AADD00202F68 /* Source */ = {
57-
isa = PBXGroup;
58-
children = (
59-
528D7E802239AADD00202F68 /* CustomRawRepresentable.swift */,
60-
528D7E812239AADD00202F68 /* BaseTrackingEventLog.swift */,
61-
528D7E822239AADD00202F68 /* BaseTrackingEvent.swift */,
62-
528D7E832239AADD00202F68 /* BaseTrackingProtocol.swift */,
63-
);
64-
path = Source;
65-
sourceTree = "<group>";
66-
};
6748
52AB663D2239A827006D4A92 = {
6849
isa = PBXGroup;
6950
children = (
@@ -94,7 +75,6 @@
9475
52AB66522239A829006D4A92 /* LaunchScreen.storyboard */,
9576
52AB66552239A829006D4A92 /* Info.plist */,
9677
52AB66502239A829006D4A92 /* Assets.xcassets */,
97-
528D7E7F2239AADD00202F68 /* Source */,
9878
);
9979
path = GADemo;
10080
sourceTree = "<group>";
@@ -127,6 +107,7 @@
127107
52AB66422239A827006D4A92 /* Sources */,
128108
52AB66432239A827006D4A92 /* Frameworks */,
129109
52AB66442239A827006D4A92 /* Resources */,
110+
F77A4BACAB7613329D17F6F5 /* [CP] Embed Pods Frameworks */,
130111
);
131112
buildRules = (
132113
);
@@ -149,6 +130,7 @@
149130
TargetAttributes = {
150131
52AB66452239A827006D4A92 = {
151132
CreatedOnToolsVersion = 10.1;
133+
LastSwiftMigration = 1020;
152134
};
153135
};
154136
};
@@ -206,6 +188,28 @@
206188
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";
207189
showEnvVarsInLog = 0;
208190
};
191+
F77A4BACAB7613329D17F6F5 /* [CP] Embed Pods Frameworks */ = {
192+
isa = PBXShellScriptBuildPhase;
193+
buildActionMask = 2147483647;
194+
files = (
195+
);
196+
inputFileListPaths = (
197+
);
198+
inputPaths = (
199+
"${PODS_ROOT}/Target Support Files/Pods-GADemo/Pods-GADemo-frameworks.sh",
200+
"${BUILT_PRODUCTS_DIR}/BaseTracking/BaseTracking.framework",
201+
);
202+
name = "[CP] Embed Pods Frameworks";
203+
outputFileListPaths = (
204+
);
205+
outputPaths = (
206+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BaseTracking.framework",
207+
);
208+
runOnlyForDeploymentPostprocessing = 0;
209+
shellPath = /bin/sh;
210+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GADemo/Pods-GADemo-frameworks.sh\"\n";
211+
showEnvVarsInLog = 0;
212+
};
209213
/* End PBXShellScriptBuildPhase section */
210214

211215
/* Begin PBXSourcesBuildPhase section */
@@ -215,12 +219,8 @@
215219
files = (
216220
52AB664C2239A828006D4A92 /* HomeViewController.swift in Sources */,
217221
528D7E8C2239B54F00202F68 /* HomeTracking.swift in Sources */,
218-
528D7E872239AADD00202F68 /* BaseTrackingProtocol.swift in Sources */,
219222
528D7E892239AB7A00202F68 /* TrackingManager.swift in Sources */,
220223
52AB664A2239A828006D4A92 /* AppDelegate.swift in Sources */,
221-
528D7E862239AADD00202F68 /* BaseTrackingEvent.swift in Sources */,
222-
528D7E842239AADD00202F68 /* CustomRawRepresentable.swift in Sources */,
223-
528D7E852239AADD00202F68 /* BaseTrackingEventLog.swift in Sources */,
224224
);
225225
runOnlyForDeploymentPostprocessing = 0;
226226
};
@@ -375,7 +375,7 @@
375375
);
376376
PRODUCT_BUNDLE_IDENTIFIER = limadeveloper.demo;
377377
PRODUCT_NAME = "$(TARGET_NAME)";
378-
SWIFT_OBJC_BRIDGING_HEADER = /Users/john/Downloads/BaseTracking/GADemo/GADemo/BridgingHeader.h;
378+
SWIFT_OBJC_BRIDGING_HEADER = /Users/limadeveloper/Documents/JOHN/Developer/Projects/iOS/Frameworks/BaseTracking/GADemo/GADemo/BridgingHeader.h;
379379
SWIFT_VERSION = 4.2;
380380
TARGETED_DEVICE_FAMILY = "1,2";
381381
};
@@ -394,7 +394,7 @@
394394
);
395395
PRODUCT_BUNDLE_IDENTIFIER = limadeveloper.demo;
396396
PRODUCT_NAME = "$(TARGET_NAME)";
397-
SWIFT_OBJC_BRIDGING_HEADER = /Users/john/Downloads/BaseTracking/GADemo/GADemo/BridgingHeader.h;
397+
SWIFT_OBJC_BRIDGING_HEADER = /Users/limadeveloper/Documents/JOHN/Developer/Projects/iOS/Frameworks/BaseTracking/GADemo/GADemo/BridgingHeader.h;
398398
SWIFT_VERSION = 4.2;
399399
TARGETED_DEVICE_FAMILY = "1,2";
400400
};

‎GADemo/GADemo/HomeTracking.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import Foundation
10+
import BaseTracking
1011

1112
struct HomeTracking: BaseTrackingEvent {
1213
enum ScreenView: String {

‎GADemo/GADemo/Source/BaseTrackingEvent.swift‎

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

‎GADemo/GADemo/Source/BaseTrackingEventLog.swift‎

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

‎GADemo/GADemo/Source/BaseTrackingProtocol.swift‎

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

‎GADemo/GADemo/Source/CustomRawRepresentable.swift‎

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

‎GADemo/GADemo/TrackingManager.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
// **********************************
1111

1212
import Foundation
13+
import BaseTracking
1314

1415
final class TrackingManager {
1516

‎GADemo/Podfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ target 'GADemo' do
66

77
# Pods for GADemo
88
pod 'GoogleAnalytics', '~> 3.17'
9+
pod 'BaseTracking', :git => 'https://github.com/limadeveloper/BaseTracking.git', :branch => 'master'
910

1011
end

0 commit comments

Comments
 (0)