Skip to content

Commit bb64075

Browse files
jonathannorrisjonathannorris
committed
feat: update obj-c iOS app
1 parent d7cf4be commit bb64075

File tree

7 files changed

+32
-162
lines changed

7 files changed

+32
-162
lines changed

‎Examples/DevCycle-iOS-Example-App-ObjC/DevCycle-iOS-Example-App-ObjC.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 55;
6+
objectVersion = 60;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
285A33FFEFD9218069227443 /* Pods_DevCycle_iOS_Example_App_ObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 857137446B5B75D339020A44 /* Pods_DevCycle_iOS_Example_App_ObjC.framework */; };
11-
52404CFA27F4EC6D00290A31 /* DevCycle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52404CF727F4EC4000290A31 /* DevCycle.framework */; };
10+
0FD94D142DDE6F860006C47B /* DevCycle in Frameworks */ = {isa = PBXBuildFile; productRef = 0FD94D132DDE6F860006C47B /* DevCycle */; };
1211
52A486D0278626E700DABA34 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A486CF278626E700DABA34 /* AppDelegate.m */; };
1312
52A486D3278626E700DABA34 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A486D2278626E700DABA34 /* SceneDelegate.m */; };
1413
52A486D6278626E700DABA34 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A486D5278626E700DABA34 /* ViewController.m */; };
@@ -19,25 +18,7 @@
1918
52A486F6278627A400DABA34 /* DevCycleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A486F5278627A400DABA34 /* DevCycleManager.m */; };
2019
/* End PBXBuildFile section */
2120

22-
/* Begin PBXContainerItemProxy section */
23-
52404CF627F4EC4000290A31 /* PBXContainerItemProxy */ = {
24-
isa = PBXContainerItemProxy;
25-
containerPortal = 52404CF127F4EC4000290A31 /* DevCycle-iOS.xcodeproj */;
26-
proxyType = 2;
27-
remoteGlobalIDString = 5268DB4D27501CFC00D17A40;
28-
remoteInfo = DevCycle;
29-
};
30-
52404CF827F4EC4000290A31 /* PBXContainerItemProxy */ = {
31-
isa = PBXContainerItemProxy;
32-
containerPortal = 52404CF127F4EC4000290A31 /* DevCycle-iOS.xcodeproj */;
33-
proxyType = 2;
34-
remoteGlobalIDString = 5268DB5627501CFC00D17A40;
35-
remoteInfo = DevCycleTests;
36-
};
37-
/* End PBXContainerItemProxy section */
38-
3921
/* Begin PBXFileReference section */
40-
52404CF127F4EC4000290A31 /* DevCycle-iOS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "DevCycle-iOS.xcodeproj"; path = "../../DevCycle-iOS.xcodeproj"; sourceTree = "<group>"; };
4122
52A486CB278626E700DABA34 /* DevCycle-iOS-Example-App-ObjC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DevCycle-iOS-Example-App-ObjC.app"; sourceTree = BUILT_PRODUCTS_DIR; };
4223
52A486CE278626E700DABA34 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
4324
52A486CF278626E700DABA34 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -52,40 +33,25 @@
5233
52A486E0278626EC00DABA34 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
5334
52A486F4278627A400DABA34 /* DevCycleManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DevCycleManager.h; sourceTree = "<group>"; };
5435
52A486F5278627A400DABA34 /* DevCycleManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DevCycleManager.m; sourceTree = "<group>"; };
55-
857137446B5B75D339020A44 /* Pods_DevCycle_iOS_Example_App_ObjC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DevCycle_iOS_Example_App_ObjC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
56-
8FADD2A7F54A55911EC1FEDA /* Pods-DevCycle-iOS-Example-App-ObjC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DevCycle-iOS-Example-App-ObjC.release.xcconfig"; path = "Target Support Files/Pods-DevCycle-iOS-Example-App-ObjC/Pods-DevCycle-iOS-Example-App-ObjC.release.xcconfig"; sourceTree = "<group>"; };
57-
FC0D4C4CD95E2D22FEDA6A90 /* Pods-DevCycle-iOS-Example-App-ObjC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DevCycle-iOS-Example-App-ObjC.debug.xcconfig"; path = "Target Support Files/Pods-DevCycle-iOS-Example-App-ObjC/Pods-DevCycle-iOS-Example-App-ObjC.debug.xcconfig"; sourceTree = "<group>"; };
5836
/* End PBXFileReference section */
5937

6038
/* Begin PBXFrameworksBuildPhase section */
6139
52A486C8278626E700DABA34 /* Frameworks */ = {
6240
isa = PBXFrameworksBuildPhase;
6341
buildActionMask = 2147483647;
6442
files = (
65-
52404CFA27F4EC6D00290A31 /* DevCycle.framework in Frameworks */,
66-
285A33FFEFD9218069227443 /* Pods_DevCycle_iOS_Example_App_ObjC.framework in Frameworks */,
43+
0FD94D142DDE6F860006C47B /* DevCycle in Frameworks */,
6744
);
6845
runOnlyForDeploymentPostprocessing = 0;
6946
};
7047
/* End PBXFrameworksBuildPhase section */
7148

7249
/* Begin PBXGroup section */
73-
52404CF227F4EC4000290A31 /* Products */ = {
74-
isa = PBXGroup;
75-
children = (
76-
52404CF727F4EC4000290A31 /* DevCycle.framework */,
77-
52404CF927F4EC4000290A31 /* DevCycleTests.xctest */,
78-
);
79-
name = Products;
80-
sourceTree = "<group>";
81-
};
8250
52A486C2278626E700DABA34 = {
8351
isa = PBXGroup;
8452
children = (
8553
52A486CD278626E700DABA34 /* DevCycle-iOS-Example-App-ObjC */,
8654
52A486CC278626E700DABA34 /* Products */,
87-
52A486F12786275800DABA34 /* Frameworks */,
88-
5C7F332C97B813F63BBB7E91 /* Pods */,
8955
);
9056
sourceTree = "<group>";
9157
};
@@ -117,36 +83,16 @@
11783
path = "DevCycle-iOS-Example-App-ObjC";
11884
sourceTree = "<group>";
11985
};
120-
52A486F12786275800DABA34 /* Frameworks */ = {
121-
isa = PBXGroup;
122-
children = (
123-
52404CF127F4EC4000290A31 /* DevCycle-iOS.xcodeproj */,
124-
857137446B5B75D339020A44 /* Pods_DevCycle_iOS_Example_App_ObjC.framework */,
125-
);
126-
name = Frameworks;
127-
sourceTree = "<group>";
128-
};
129-
5C7F332C97B813F63BBB7E91 /* Pods */ = {
130-
isa = PBXGroup;
131-
children = (
132-
FC0D4C4CD95E2D22FEDA6A90 /* Pods-DevCycle-iOS-Example-App-ObjC.debug.xcconfig */,
133-
8FADD2A7F54A55911EC1FEDA /* Pods-DevCycle-iOS-Example-App-ObjC.release.xcconfig */,
134-
);
135-
path = Pods;
136-
sourceTree = "<group>";
137-
};
13886
/* End PBXGroup section */
13987

14088
/* Begin PBXNativeTarget section */
14189
52A486CA278626E700DABA34 /* DevCycle-iOS-Example-App-ObjC */ = {
14290
isa = PBXNativeTarget;
14391
buildConfigurationList = 52A486E4278626EC00DABA34 /* Build configuration list for PBXNativeTarget "DevCycle-iOS-Example-App-ObjC" */;
14492
buildPhases = (
145-
91BF38D5CA9E3A1C9684BAC6 /* [CP] Check Pods Manifest.lock */,
14693
52A486C7278626E700DABA34 /* Sources */,
14794
52A486C8278626E700DABA34 /* Frameworks */,
14895
52A486C9278626E700DABA34 /* Resources */,
149-
E77A4A67858AE95D2606FB38 /* [CP] Embed Pods Frameworks */,
15096
);
15197
buildRules = (
15298
);
@@ -164,7 +110,7 @@
164110
isa = PBXProject;
165111
attributes = {
166112
BuildIndependentTargetsInParallel = 1;
167-
LastUpgradeCheck = 1310;
113+
LastUpgradeCheck = 1630;
168114
TargetAttributes = {
169115
52A486CA278626E700DABA34 = {
170116
CreatedOnToolsVersion = 13.1;
@@ -180,38 +126,18 @@
180126
Base,
181127
);
182128
mainGroup = 52A486C2278626E700DABA34;
129+
packageReferences = (
130+
0FD94D122DDE6F860006C47B /* XCLocalSwiftPackageReference "../../../ios-client-sdk" */,
131+
);
183132
productRefGroup = 52A486CC278626E700DABA34 /* Products */;
184133
projectDirPath = "";
185-
projectReferences = (
186-
{
187-
ProductGroup = 52404CF227F4EC4000290A31 /* Products */;
188-
ProjectRef = 52404CF127F4EC4000290A31 /* DevCycle-iOS.xcodeproj */;
189-
},
190-
);
191134
projectRoot = "";
192135
targets = (
193136
52A486CA278626E700DABA34 /* DevCycle-iOS-Example-App-ObjC */,
194137
);
195138
};
196139
/* End PBXProject section */
197140

198-
/* Begin PBXReferenceProxy section */
199-
52404CF727F4EC4000290A31 /* DevCycle.framework */ = {
200-
isa = PBXReferenceProxy;
201-
fileType = wrapper.framework;
202-
path = DevCycle.framework;
203-
remoteRef = 52404CF627F4EC4000290A31 /* PBXContainerItemProxy */;
204-
sourceTree = BUILT_PRODUCTS_DIR;
205-
};
206-
52404CF927F4EC4000290A31 /* DevCycleTests.xctest */ = {
207-
isa = PBXReferenceProxy;
208-
fileType = wrapper.cfbundle;
209-
path = DevCycleTests.xctest;
210-
remoteRef = 52404CF827F4EC4000290A31 /* PBXContainerItemProxy */;
211-
sourceTree = BUILT_PRODUCTS_DIR;
212-
};
213-
/* End PBXReferenceProxy section */
214-
215141
/* Begin PBXResourcesBuildPhase section */
216142
52A486C9278626E700DABA34 /* Resources */ = {
217143
isa = PBXResourcesBuildPhase;
@@ -225,48 +151,6 @@
225151
};
226152
/* End PBXResourcesBuildPhase section */
227153

228-
/* Begin PBXShellScriptBuildPhase section */
229-
91BF38D5CA9E3A1C9684BAC6 /* [CP] Check Pods Manifest.lock */ = {
230-
isa = PBXShellScriptBuildPhase;
231-
buildActionMask = 2147483647;
232-
files = (
233-
);
234-
inputFileListPaths = (
235-
);
236-
inputPaths = (
237-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
238-
"${PODS_ROOT}/Manifest.lock",
239-
);
240-
name = "[CP] Check Pods Manifest.lock";
241-
outputFileListPaths = (
242-
);
243-
outputPaths = (
244-
"$(DERIVED_FILE_DIR)/Pods-DevCycle-iOS-Example-App-ObjC-checkManifestLockResult.txt",
245-
);
246-
runOnlyForDeploymentPostprocessing = 0;
247-
shellPath = /bin/sh;
248-
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";
249-
showEnvVarsInLog = 0;
250-
};
251-
E77A4A67858AE95D2606FB38 /* [CP] Embed Pods Frameworks */ = {
252-
isa = PBXShellScriptBuildPhase;
253-
buildActionMask = 2147483647;
254-
files = (
255-
);
256-
inputFileListPaths = (
257-
"${PODS_ROOT}/Target Support Files/Pods-DevCycle-iOS-Example-App-ObjC/Pods-DevCycle-iOS-Example-App-ObjC-frameworks-${CONFIGURATION}-input-files.xcfilelist",
258-
);
259-
name = "[CP] Embed Pods Frameworks";
260-
outputFileListPaths = (
261-
"${PODS_ROOT}/Target Support Files/Pods-DevCycle-iOS-Example-App-ObjC/Pods-DevCycle-iOS-Example-App-ObjC-frameworks-${CONFIGURATION}-output-files.xcfilelist",
262-
);
263-
runOnlyForDeploymentPostprocessing = 0;
264-
shellPath = /bin/sh;
265-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DevCycle-iOS-Example-App-ObjC/Pods-DevCycle-iOS-Example-App-ObjC-frameworks.sh\"\n";
266-
showEnvVarsInLog = 0;
267-
};
268-
/* End PBXShellScriptBuildPhase section */
269-
270154
/* Begin PBXSourcesBuildPhase section */
271155
52A486C7278626E700DABA34 /* Sources */ = {
272156
isa = PBXSourcesBuildPhase;
@@ -337,8 +221,10 @@
337221
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
338222
COPY_PHASE_STRIP = NO;
339223
DEBUG_INFORMATION_FORMAT = dwarf;
224+
DEVELOPMENT_TEAM = ASZYP8H6QE;
340225
ENABLE_STRICT_OBJC_MSGSEND = YES;
341226
ENABLE_TESTABILITY = YES;
227+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
342228
GCC_C_LANGUAGE_STANDARD = gnu11;
343229
GCC_DYNAMIC_NO_PIC = NO;
344230
GCC_NO_COMMON_BLOCKS = YES;
@@ -396,8 +282,10 @@
396282
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
397283
COPY_PHASE_STRIP = NO;
398284
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
285+
DEVELOPMENT_TEAM = ASZYP8H6QE;
399286
ENABLE_NS_ASSERTIONS = NO;
400287
ENABLE_STRICT_OBJC_MSGSEND = YES;
288+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
401289
GCC_C_LANGUAGE_STANDARD = gnu11;
402290
GCC_NO_COMMON_BLOCKS = YES;
403291
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -416,13 +304,11 @@
416304
};
417305
52A486E5278626EC00DABA34 /* Debug */ = {
418306
isa = XCBuildConfiguration;
419-
baseConfigurationReference = FC0D4C4CD95E2D22FEDA6A90 /* Pods-DevCycle-iOS-Example-App-ObjC.debug.xcconfig */;
420307
buildSettings = {
421308
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
422309
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
423310
CODE_SIGN_STYLE = Automatic;
424311
CURRENT_PROJECT_VERSION = 1;
425-
DEVELOPMENT_TEAM = ASZYP8H6QE;
426312
GENERATE_INFOPLIST_FILE = YES;
427313
INFOPLIST_FILE = "DevCycle-iOS-Example-App-ObjC/Info.plist";
428314
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -444,13 +330,11 @@
444330
};
445331
52A486E6278626EC00DABA34 /* Release */ = {
446332
isa = XCBuildConfiguration;
447-
baseConfigurationReference = 8FADD2A7F54A55911EC1FEDA /* Pods-DevCycle-iOS-Example-App-ObjC.release.xcconfig */;
448333
buildSettings = {
449334
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
450335
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
451336
CODE_SIGN_STYLE = Automatic;
452337
CURRENT_PROJECT_VERSION = 1;
453-
DEVELOPMENT_TEAM = ASZYP8H6QE;
454338
GENERATE_INFOPLIST_FILE = YES;
455339
INFOPLIST_FILE = "DevCycle-iOS-Example-App-ObjC/Info.plist";
456340
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -492,6 +376,20 @@
492376
defaultConfigurationName = Release;
493377
};
494378
/* End XCConfigurationList section */
379+
380+
/* Begin XCLocalSwiftPackageReference section */
381+
0FD94D122DDE6F860006C47B /* XCLocalSwiftPackageReference "../../../ios-client-sdk" */ = {
382+
isa = XCLocalSwiftPackageReference;
383+
relativePath = "../../../ios-client-sdk";
384+
};
385+
/* End XCLocalSwiftPackageReference section */
386+
387+
/* Begin XCSwiftPackageProductDependency section */
388+
0FD94D132DDE6F860006C47B /* DevCycle */ = {
389+
isa = XCSwiftPackageProductDependency;
390+
productName = DevCycle;
391+
};
392+
/* End XCSwiftPackageProductDependency section */
495393
};
496394
rootObject = 52A486C3278626E700DABA34 /* Project object */;
497395
}

‎Examples/DevCycle-iOS-Example-App-ObjC/DevCycle-iOS-Example-App-ObjC.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/DevCycle-iOS-Example-App-ObjC/DevCycle-iOS-Example-App-ObjC.xcworkspace/contents.xcworkspacedata‎

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

‎Examples/DevCycle-iOS-Example-App-ObjC/DevCycle-iOS-Example-App-ObjC.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

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

‎Examples/DevCycle-iOS-Example-App-ObjC/DevCycle-iOS-Example-App-ObjC/AppDelegate.m‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,21 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
3333
}
3434

3535
NSString *stringValue = [client stringVariableValueWithKey:@"string_key" defaultValue:@"default"];
36+
3637
NSNumber *numValue = [client numberVariableValueWithKey:@"num_key" defaultValue:@610];
38+
3739
BOOL boolValue = [client boolVariableValueWithKey:@"bool_key" defaultValue:NO];
40+
3841
DVCVariable *jsonVar = [[client jsonVariableWithKey:@"json_key" defaultValue:@{@"key": @"value"}]
3942
onUpdateWithHandler:^(id _Nonnull value) {
4043
NSLog(@"json_key value updated: %@", value);
4144
}];
4245

43-
NSLog(@"DevCycle Variable Values\n string: %@\n num: %@\n bool: %@\n json: %@", stringValue, numValue, boolValue, jsonVar.value);
46+
NSLog(@"DevCycle Variable Values\n string: %@\n num: %@\n bool: %i\n json: %@", stringValue, numValue, boolValue, jsonVar.value);
4447

4548
NSDictionary *allFeatures = [client allFeatures];
4649
NSLog(@"DevCycle All Features: %@", allFeatures);
50+
4751
NSDictionary *allVariables = [client allVariables];
4852
NSLog(@"DevCycle All Variables: %@", allVariables);
4953
}];

‎Examples/DevCycle-iOS-Example-App-ObjC/DevCycle-iOS-Example-App-ObjC/DevCycleManager.m‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ - (DevCycleClient*)initialize:(DevCycleUser *)user onInitialized:(void (^_Nullab
4242
self.client = [DevCycleClient initialize:DEVCYCLE_KEY
4343
user:user
4444
options:options
45-
onInitialized:^(NSError * _Nullable error) {
46-
if (error) {
47-
NSLog(@"DevCycle failed to initialize: %@", error);
48-
}
49-
}];
45+
onInitialized:onInitialized];
5046
if (err) {
5147
NSLog(@"Error Starting DevCycle: %@", err);
5248
}

‎Examples/DevCycle-iOS-Example-App-ObjC/Podfile‎

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

0 commit comments

Comments
 (0)