Skip to content

Commit bbf2b87

Browse files
muukiimuukii
committed
Update logging
1 parent f40b37a commit bbf2b87

10 files changed

Lines changed: 83 additions & 183 deletions

File tree

‎Podfile‎

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

‎Podfile.lock‎

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

‎ScrollEdgeControl-Demo/Components.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ enum Components {
3232
handler()
3333
}
3434

35-
return MondrianLayout.AnyView.init { _ in
35+
return AnyView.init { _ in
3636
label
3737
.viewBlock
3838
.padding(4)

‎ScrollEdgeControl.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
4B66215F27515AD100509356 /* TypedTextAttributes in Frameworks */ = {isa = PBXBuildFile; productRef = 4B66215E27515AD100509356 /* TypedTextAttributes */; };
2424
4B66216227515B1900509356 /* StorybookKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4B66216127515B1900509356 /* StorybookKit */; };
2525
4B66216427515B1900509356 /* StorybookUI in Frameworks */ = {isa = PBXBuildFile; productRef = 4B66216327515B1900509356 /* StorybookUI */; };
26+
4B6ABA2A2796E28600D9BFC6 /* CompositionKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4B6ABA292796E28600D9BFC6 /* CompositionKit */; };
2627
4BC42830275157320047A850 /* ScrollEdgeControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC4282F275157320047A850 /* ScrollEdgeControl.swift */; };
2728
4BC42833275157C00047A850 /* Advance in Frameworks */ = {isa = PBXBuildFile; productRef = 4BC42832275157C00047A850 /* Advance */; };
2829
4BC4283B275158240047A850 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC4283A275158240047A850 /* AppDelegate.swift */; };
@@ -31,7 +32,6 @@
3132
4BC42850275158F80047A850 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 4BC4284F275158F80047A850 /* RxCocoa */; };
3233
4BC42852275158F80047A850 /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = 4BC42851275158F80047A850 /* RxRelay */; };
3334
4BC42854275158F80047A850 /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 4BC42853275158F80047A850 /* RxSwift */; };
34-
F8089280E94B364D58AE9485 /* Pods_ScrollEdgeControl_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60BDB8D112209913C6592E80 /* Pods_ScrollEdgeControl_Demo.framework */; };
3535
/* End PBXBuildFile section */
3636

3737
/* Begin PBXContainerItemProxy section */
@@ -75,16 +75,14 @@
7575
4BC42843275158250047A850 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
7676
4BC42846275158250047A850 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7777
4BC42848275158250047A850 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
78-
5B3676DD0B14A8AF4A1E0950 /* Pods-ScrollEdgeControl-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ScrollEdgeControl-Demo.debug.xcconfig"; path = "Target Support Files/Pods-ScrollEdgeControl-Demo/Pods-ScrollEdgeControl-Demo.debug.xcconfig"; sourceTree = "<group>"; };
79-
60BDB8D112209913C6592E80 /* Pods_ScrollEdgeControl_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ScrollEdgeControl_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
80-
DB5E62FBEBBEB80367C27AF9 /* Pods-ScrollEdgeControl-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ScrollEdgeControl-Demo.release.xcconfig"; path = "Target Support Files/Pods-ScrollEdgeControl-Demo/Pods-ScrollEdgeControl-Demo.release.xcconfig"; sourceTree = "<group>"; };
8178
/* End PBXFileReference section */
8279

8380
/* Begin PBXFrameworksBuildPhase section */
8481
4BC42822275157080047A850 /* Frameworks */ = {
8582
isa = PBXFrameworksBuildPhase;
8683
buildActionMask = 2147483647;
8784
files = (
85+
4B6ABA2A2796E28600D9BFC6 /* CompositionKit in Frameworks */,
8886
4BC42833275157C00047A850 /* Advance in Frameworks */,
8987
);
9088
runOnlyForDeploymentPostprocessing = 0;
@@ -102,7 +100,6 @@
102100
4BC42850275158F80047A850 /* RxCocoa in Frameworks */,
103101
4B5E52E527515E0A0075AE52 /* MondrianLayout in Frameworks */,
104102
4B66216427515B1900509356 /* StorybookUI in Frameworks */,
105-
F8089280E94B364D58AE9485 /* Pods_ScrollEdgeControl_Demo.framework in Frameworks */,
106103
);
107104
runOnlyForDeploymentPostprocessing = 0;
108105
};
@@ -132,8 +129,6 @@
132129
4BC42827275157080047A850 /* ScrollEdgeControl */,
133130
4BC42839275158240047A850 /* ScrollEdgeControl-Demo */,
134131
4BC42826275157080047A850 /* Products */,
135-
B9E9D6475B235419648CE13E /* Pods */,
136-
BC117ED058EB0299D47C5B75 /* Frameworks */,
137132
);
138133
sourceTree = "<group>";
139134
};
@@ -173,23 +168,6 @@
173168
path = "ScrollEdgeControl-Demo";
174169
sourceTree = "<group>";
175170
};
176-
B9E9D6475B235419648CE13E /* Pods */ = {
177-
isa = PBXGroup;
178-
children = (
179-
5B3676DD0B14A8AF4A1E0950 /* Pods-ScrollEdgeControl-Demo.debug.xcconfig */,
180-
DB5E62FBEBBEB80367C27AF9 /* Pods-ScrollEdgeControl-Demo.release.xcconfig */,
181-
);
182-
path = Pods;
183-
sourceTree = "<group>";
184-
};
185-
BC117ED058EB0299D47C5B75 /* Frameworks */ = {
186-
isa = PBXGroup;
187-
children = (
188-
60BDB8D112209913C6592E80 /* Pods_ScrollEdgeControl_Demo.framework */,
189-
);
190-
name = Frameworks;
191-
sourceTree = "<group>";
192-
};
193171
/* End PBXGroup section */
194172

195173
/* Begin PBXHeadersBuildPhase section */
@@ -219,6 +197,7 @@
219197
name = ScrollEdgeControl;
220198
packageProductDependencies = (
221199
4BC42832275157C00047A850 /* Advance */,
200+
4B6ABA292796E28600D9BFC6 /* CompositionKit */,
222201
);
223202
productName = ScrollEdgeControl;
224203
productReference = 4BC42825275157080047A850 /* ScrollEdgeControl.framework */;
@@ -228,12 +207,10 @@
228207
isa = PBXNativeTarget;
229208
buildConfigurationList = 4BC42849275158250047A850 /* Build configuration list for PBXNativeTarget "ScrollEdgeControl-Demo" */;
230209
buildPhases = (
231-
B0B6502762FA73F77F644FD6 /* [CP] Check Pods Manifest.lock */,
232210
4BC42834275158240047A850 /* Sources */,
233211
4BC42835275158240047A850 /* Frameworks */,
234212
4BC42836275158240047A850 /* Resources */,
235213
4B5E52DC27515CF20075AE52 /* Embed Frameworks */,
236-
111918E2BF19D3B85370D628 /* [CP] Embed Pods Frameworks */,
237214
);
238215
buildRules = (
239216
);
@@ -289,6 +266,7 @@
289266
4B66216027515B1800509356 /* XCRemoteSwiftPackageReference "Storybook-ios" */,
290267
4B5E52E327515E0A0075AE52 /* XCRemoteSwiftPackageReference "MondrianLayout" */,
291268
4B39D04D2752740000D013F4 /* XCRemoteSwiftPackageReference "StackScrollView" */,
269+
4B6ABA282796E28600D9BFC6 /* XCRemoteSwiftPackageReference "CompositionKit" */,
292270
);
293271
productRefGroup = 4BC42826275157080047A850 /* Products */;
294272
projectDirPath = "";
@@ -319,48 +297,6 @@
319297
};
320298
/* End PBXResourcesBuildPhase section */
321299

322-
/* Begin PBXShellScriptBuildPhase section */
323-
111918E2BF19D3B85370D628 /* [CP] Embed Pods Frameworks */ = {
324-
isa = PBXShellScriptBuildPhase;
325-
buildActionMask = 2147483647;
326-
files = (
327-
);
328-
inputFileListPaths = (
329-
"${PODS_ROOT}/Target Support Files/Pods-ScrollEdgeControl-Demo/Pods-ScrollEdgeControl-Demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
330-
);
331-
name = "[CP] Embed Pods Frameworks";
332-
outputFileListPaths = (
333-
"${PODS_ROOT}/Target Support Files/Pods-ScrollEdgeControl-Demo/Pods-ScrollEdgeControl-Demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
334-
);
335-
runOnlyForDeploymentPostprocessing = 0;
336-
shellPath = /bin/sh;
337-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ScrollEdgeControl-Demo/Pods-ScrollEdgeControl-Demo-frameworks.sh\"\n";
338-
showEnvVarsInLog = 0;
339-
};
340-
B0B6502762FA73F77F644FD6 /* [CP] Check Pods Manifest.lock */ = {
341-
isa = PBXShellScriptBuildPhase;
342-
buildActionMask = 2147483647;
343-
files = (
344-
);
345-
inputFileListPaths = (
346-
);
347-
inputPaths = (
348-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
349-
"${PODS_ROOT}/Manifest.lock",
350-
);
351-
name = "[CP] Check Pods Manifest.lock";
352-
outputFileListPaths = (
353-
);
354-
outputPaths = (
355-
"$(DERIVED_FILE_DIR)/Pods-ScrollEdgeControl-Demo-checkManifestLockResult.txt",
356-
);
357-
runOnlyForDeploymentPostprocessing = 0;
358-
shellPath = /bin/sh;
359-
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";
360-
showEnvVarsInLog = 0;
361-
};
362-
/* End PBXShellScriptBuildPhase section */
363-
364300
/* Begin PBXSourcesBuildPhase section */
365301
4BC42821275157080047A850 /* Sources */ = {
366302
isa = PBXSourcesBuildPhase;
@@ -466,7 +402,7 @@
466402
MTL_FAST_MATH = YES;
467403
ONLY_ACTIVE_ARCH = YES;
468404
SDKROOT = iphoneos;
469-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
405+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG SCROLLEDGECONTROL_LOG_ENABLED";
470406
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
471407
VERSIONING_SYSTEM = "apple-generic";
472408
VERSION_INFO_PREFIX = "";
@@ -587,7 +523,6 @@
587523
};
588524
4BC4284A275158250047A850 /* Debug */ = {
589525
isa = XCBuildConfiguration;
590-
baseConfigurationReference = 5B3676DD0B14A8AF4A1E0950 /* Pods-ScrollEdgeControl-Demo.debug.xcconfig */;
591526
buildSettings = {
592527
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
593528
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -615,7 +550,6 @@
615550
};
616551
4BC4284B275158250047A850 /* Release */ = {
617552
isa = XCBuildConfiguration;
618-
baseConfigurationReference = DB5E62FBEBBEB80367C27AF9 /* Pods-ScrollEdgeControl-Demo.release.xcconfig */;
619553
buildSettings = {
620554
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
621555
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -706,6 +640,14 @@
706640
minimumVersion = 1.0.0;
707641
};
708642
};
643+
4B6ABA282796E28600D9BFC6 /* XCRemoteSwiftPackageReference "CompositionKit" */ = {
644+
isa = XCRemoteSwiftPackageReference;
645+
repositoryURL = "https://github.com/muukii/CompositionKit.git";
646+
requirement = {
647+
kind = upToNextMajorVersion;
648+
minimumVersion = 0.2.1;
649+
};
650+
};
709651
4BC42831275157C00047A850 /* XCRemoteSwiftPackageReference "Advance" */ = {
710652
isa = XCRemoteSwiftPackageReference;
711653
repositoryURL = "git@github.com:timdonnelly/Advance.git";
@@ -750,6 +692,11 @@
750692
package = 4B66216027515B1800509356 /* XCRemoteSwiftPackageReference "Storybook-ios" */;
751693
productName = StorybookUI;
752694
};
695+
4B6ABA292796E28600D9BFC6 /* CompositionKit */ = {
696+
isa = XCSwiftPackageProductDependency;
697+
package = 4B6ABA282796E28600D9BFC6 /* XCRemoteSwiftPackageReference "CompositionKit" */;
698+
productName = CompositionKit;
699+
};
753700
4BC42832275157C00047A850 /* Advance */ = {
754701
isa = XCSwiftPackageProductDependency;
755702
package = 4BC42831275157C00047A850 /* XCRemoteSwiftPackageReference "Advance" */;

‎ScrollEdgeControl.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 32 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ScrollEdgeControl.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Bucket
3+
uuid = "47258612-EB0A-429C-9D16-FC1E9A895CAB"
4+
type = "4"
5+
version = "2.0">
6+
<Breakpoints>
7+
<BreakpointProxy
8+
BreakpointExtensionID = "Xcode.Breakpoint.SymbolicBreakpoint">
9+
<BreakpointContent
10+
uuid = "C9CE3BF8-7173-4116-B160-3D92C310E179"
11+
shouldBeEnabled = "Yes"
12+
ignoreCount = "0"
13+
continueAfterRunningActions = "Yes"
14+
symbolName = "UIApplicationMain"
15+
moduleName = "">
16+
<Actions>
17+
<BreakpointActionProxy
18+
ActionExtensionID = "Xcode.BreakpointAction.DebuggerCommand">
19+
<ActionContent
20+
consoleCommand = "reveal load --autostart">
21+
</ActionContent>
22+
</BreakpointActionProxy>
23+
</Actions>
24+
<Locations>
25+
</Locations>
26+
</BreakpointContent>
27+
</BreakpointProxy>
28+
</Breakpoints>
29+
</Bucket>

‎ScrollEdgeControl.xcworkspace/contents.xcworkspacedata‎

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

‎ScrollEdgeControl.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

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

0 commit comments

Comments
 (0)