Skip to content

Commit 34ddbbe

Browse files
authored
Merge pull request #44 from mixpanel/add-more-apis
add new settings APIs(setUseIpAddressForGeolocation, setLoggingEnabled, setServerURL)
2 parents 71a38bf + 5d9c3e7 commit 34ddbbe

File tree

13 files changed

+1112
-1738
lines changed

13 files changed

+1112
-1738
lines changed

.travis.yml

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

MixpanelDemo/ios/Empty.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//
2+
// Empty.swift
3+
// MixpanelDemo
4+
//
5+
// Created by ZIHE JIA on 4/30/21.
6+
//
7+
8+
import Foundation
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//
2+
// Use this file to import your target's public headers that you would like to expose to Swift.
3+
//
4+

MixpanelDemo/ios/MixpanelDemo.xcodeproj/project.pbxproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1919
2DCD954D1E0B4F2C00145EB5 /* MixpanelDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* MixpanelDemoTests.m */; };
2020
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
21+
862F7C44263CD53A00F67ED4 /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 862F7C43263CD53A00F67ED4 /* Empty.swift */; };
2122
9561CA7D9A25C2BC498FE73D /* libPods-MixpanelDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E29F404F822B45ECA7D0A59 /* libPods-MixpanelDemo.a */; };
2223
EAD753392B2501CEDB1EBC8E /* libPods-MixpanelDemo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 33E45CC1F7F9BD597DAFF3D4 /* libPods-MixpanelDemo-tvOS.a */; };
2324
/* End PBXBuildFile section */
@@ -59,6 +60,8 @@
5960
33E45CC1F7F9BD597DAFF3D4 /* libPods-MixpanelDemo-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MixpanelDemo-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6061
60776E74F7AEBEFD3EB461E9 /* Pods-MixpanelDemo-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixpanelDemo-tvOS.release.xcconfig"; path = "Target Support Files/Pods-MixpanelDemo-tvOS/Pods-MixpanelDemo-tvOS.release.xcconfig"; sourceTree = "<group>"; };
6162
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = MixpanelDemo/LaunchScreen.storyboard; sourceTree = "<group>"; };
63+
862F7C42263CD53A00F67ED4 /* MixpanelDemo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MixpanelDemo-Bridging-Header.h"; sourceTree = "<group>"; };
64+
862F7C43263CD53A00F67ED4 /* Empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Empty.swift; sourceTree = "<group>"; };
6265
95E1F386AB50B6159FAEF19A /* Pods-MixpanelDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixpanelDemo.debug.xcconfig"; path = "Target Support Files/Pods-MixpanelDemo/Pods-MixpanelDemo.debug.xcconfig"; sourceTree = "<group>"; };
6366
9E29F404F822B45ECA7D0A59 /* libPods-MixpanelDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MixpanelDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6467
B9764A5B9B45F21BD7CB2CBC /* Pods-MixpanelDemo-MixpanelDemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MixpanelDemo-MixpanelDemoTests.release.xcconfig"; path = "Target Support Files/Pods-MixpanelDemo-MixpanelDemoTests/Pods-MixpanelDemo-MixpanelDemoTests.release.xcconfig"; sourceTree = "<group>"; };
@@ -134,7 +137,6 @@
134137
2A1DE7E5A497266D26B3C2E9 /* Pods-MixpanelDemo-tvOSTests.debug.xcconfig */,
135138
15B943AAE69F4D9E352E81B0 /* Pods-MixpanelDemo-tvOSTests.release.xcconfig */,
136139
);
137-
name = Pods;
138140
path = Pods;
139141
sourceTree = "<group>";
140142
};
@@ -148,6 +150,8 @@
148150
13B07FB61A68108700A75B9A /* Info.plist */,
149151
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
150152
13B07FB71A68108700A75B9A /* main.m */,
153+
862F7C43263CD53A00F67ED4 /* Empty.swift */,
154+
862F7C42263CD53A00F67ED4 /* MixpanelDemo-Bridging-Header.h */,
151155
);
152156
name = MixpanelDemo;
153157
sourceTree = "<group>";
@@ -294,7 +298,7 @@
294298
TestTargetID = 13B07F861A680F5B00A75B9A;
295299
};
296300
13B07F861A680F5B00A75B9A = {
297-
LastSwiftMigration = 1120;
301+
LastSwiftMigration = 1250;
298302
};
299303
2D02E47A1E0B4A5D006451C7 = {
300304
CreatedOnToolsVersion = 8.2.1;
@@ -654,6 +658,7 @@
654658
files = (
655659
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
656660
13B07FC11A68108700A75B9A /* main.m in Sources */,
661+
862F7C44263CD53A00F67ED4 /* Empty.swift in Sources */,
657662
);
658663
runOnlyForDeploymentPostprocessing = 0;
659664
};
@@ -694,6 +699,7 @@
694699
isa = XCBuildConfiguration;
695700
baseConfigurationReference = 17C020705F9400DFE629B2F1 /* Pods-MixpanelDemo-MixpanelDemoTests.debug.xcconfig */;
696701
buildSettings = {
702+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
697703
BUNDLE_LOADER = "$(TEST_HOST)";
698704
GCC_PREPROCESSOR_DEFINITIONS = (
699705
"DEBUG=1",
@@ -717,6 +723,7 @@
717723
isa = XCBuildConfiguration;
718724
baseConfigurationReference = B9764A5B9B45F21BD7CB2CBC /* Pods-MixpanelDemo-MixpanelDemoTests.release.xcconfig */;
719725
buildSettings = {
726+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
720727
BUNDLE_LOADER = "$(TEST_HOST)";
721728
COPY_PHASE_STRIP = NO;
722729
INFOPLIST_FILE = MixpanelDemoTests/Info.plist;
@@ -750,6 +757,7 @@
750757
);
751758
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
752759
PRODUCT_NAME = MixpanelDemo;
760+
SWIFT_OBJC_BRIDGING_HEADER = "MixpanelDemo-Bridging-Header.h";
753761
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
754762
SWIFT_VERSION = 5.0;
755763
VERSIONING_SYSTEM = "apple-generic";
@@ -772,6 +780,7 @@
772780
);
773781
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
774782
PRODUCT_NAME = MixpanelDemo;
783+
SWIFT_OBJC_BRIDGING_HEADER = "MixpanelDemo-Bridging-Header.h";
775784
SWIFT_VERSION = 5.0;
776785
VERSIONING_SYSTEM = "apple-generic";
777786
};
@@ -938,7 +947,6 @@
938947
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
939948
LIBRARY_SEARCH_PATHS = (
940949
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
941-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
942950
"\"$(inherited)\"",
943951
);
944952
MTL_ENABLE_DEBUG_INFO = YES;
@@ -991,7 +999,6 @@
991999
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
9921000
LIBRARY_SEARCH_PATHS = (
9931001
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
994-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
9951002
"\"$(inherited)\"",
9961003
);
9971004
MTL_ENABLE_DEBUG_INFO = NO;

0 commit comments

Comments
 (0)