Skip to content

Commit 3039f37

Browse files
ddaddyddaddy
committed
Fixed Carthage build for SwiftUI
1 parent 8ce9622 commit 3039f37

10 files changed

+672
-34
lines changed

‎DJSwiftHelpers.xcodeproj/project.pbxproj

+423-14
Large diffs are not rendered by default.

‎DJSwiftHelpers.xcodeproj/xcshareddata/xcschemes/DJSwiftHelpers.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1410"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎DJSwiftHelpers.xcodeproj/xcshareddata/xcschemes/DJSwiftHelpers_Extension.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1410"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎DJSwiftHelpers.xcodeproj/xcshareddata/xcschemes/DJSwiftHelpers_MacOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1410"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎DJSwiftHelpers.xcodeproj/xcshareddata/xcschemes/DJSwiftHelpers_SwiftUI.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1410"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "622E8B3F29167E34009F7A8D"
18+
BuildableName = "DJSwiftHelpers_SwiftUI.framework"
19+
BlueprintName = "DJSwiftHelpers_SwiftUI"
20+
ReferencedContainer = "container:DJSwiftHelpers.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "622E8B3F29167E34009F7A8D"
54+
BuildableName = "DJSwiftHelpers_SwiftUI.framework"
55+
BlueprintName = "DJSwiftHelpers_SwiftUI"
56+
ReferencedContainer = "container:DJSwiftHelpers.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎DJSwiftHelpers.xcodeproj/xcshareddata/xcschemes/DJSwiftHelpers_SwiftUI_MacOS.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1410"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "622E8B5B291683C1009F7A8D"
18+
BuildableName = "DJSwiftHelpers_SwiftUI.framework"
19+
BlueprintName = "DJSwiftHelpers_SwiftUI_MacOS"
20+
ReferencedContainer = "container:DJSwiftHelpers.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "622E8B5B291683C1009F7A8D"
54+
BuildableName = "DJSwiftHelpers_SwiftUI.framework"
55+
BlueprintName = "DJSwiftHelpers_SwiftUI_MacOS"
56+
ReferencedContainer = "container:DJSwiftHelpers.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎DJSwiftHelpers.xcodeproj/xcshareddata/xcschemes/DJSwiftHelpers_SwiftUI_WatchOS.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1410"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "622E8B692916848F009F7A8D"
18+
BuildableName = "DJSwiftHelpers_SwiftUI.framework"
19+
BlueprintName = "DJSwiftHelpers_SwiftUI_WatchOS"
20+
ReferencedContainer = "container:DJSwiftHelpers.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "622E8B692916848F009F7A8D"
54+
BuildableName = "DJSwiftHelpers_SwiftUI.framework"
55+
BlueprintName = "DJSwiftHelpers_SwiftUI_WatchOS"
56+
ReferencedContainer = "container:DJSwiftHelpers.xcodeproj">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎DJSwiftHelpers.xcodeproj/xcshareddata/xcschemes/DJSwiftHelpers_Watch.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1410"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎DJSwiftHelpers_SwiftUI_MacOS/DJSwiftHelpers_SwiftUI_MacOS.h

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// DJSwiftHelpers_SwiftUI_MacOS.h
3+
// DJSwiftHelpers_SwiftUI_MacOS
4+
//
5+
// Created by Darren Jones on 05/11/2022.
6+
// Copyright © 2022 Dappological Ltd. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
//! Project version number for DJSwiftHelpers_SwiftUI_MacOS.
12+
FOUNDATION_EXPORT double DJSwiftHelpers_SwiftUI_MacOSVersionNumber;
13+
14+
//! Project version string for DJSwiftHelpers_SwiftUI_MacOS.
15+
FOUNDATION_EXPORT const unsigned char DJSwiftHelpers_SwiftUI_MacOSVersionString[];
16+
17+
// In this header, you should import all the public headers of your framework using statements like #import <DJSwiftHelpers_SwiftUI_MacOS/PublicHeader.h>
18+
19+

‎README.md

+25-16
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DJSwiftHelpers is a Swift library containing useful Swift extensions. It allows
88

99
Add the package `[email protected]:ddaddy/DJSwiftHelpers.git` to your project.
1010

11-
For most helpers you can `import DJSwiftHelpers` however for additional `UIKit` helpers that are not extension friendly, also `import DJSwiftHelpers_UIKit`
11+
For most helpers you can `import DJSwiftHelpers` however for additional `UIKit` or `SwiftUI` helpers that are not extension friendly, also `import DJSwiftHelpers_UIKit` or `import DJSwiftHelpers_SwiftUI`
1212

1313
## Integrate using Carthage
1414

@@ -33,10 +33,11 @@ Save and then run:
3333
$ carthage update --use-xcframeworks
3434
```
3535

36-
Once complete, drag both (as required)
36+
Once complete, drag libraries as required
3737

3838
* Carthage/Build/iOS/DJSwiftHelpers
3939
* Carthage/Build/iOS/DJSwiftHelpers_Extension
40+
* Carthage/Build/iOS/DJSwiftHelpers_SwiftUI
4041

4142
into the `Frameworks, Libraries & Embeded Content` section of your project.
4243

@@ -206,20 +207,6 @@ Change the colour of certain text within an `NSMutableAttributedString`
206207
func setColorForText(textToFind: String, withColor color: UIColor)
207208
```
208209

209-
210-
### SafariActivityView
211-
212-
A SwiftUI view to display the share sheet with `Open in Safari`
213-
214-
```swift
215-
Example:
216-
217-
.background(
218-
// Share button action
219-
SafariActivityView(isPresented: $activityPresented, url: url)
220-
)
221-
```
222-
223210
### String
224211
Truncate a string by removing all characters at the `position`
225212

@@ -484,6 +471,28 @@ Delete all `UserDefault`'s for the containing `bundleIdentifier`
484471
func resetDefaults()
485472
```
486473

474+
## SwiftUI
475+
### SafariActivityView
476+
477+
A SwiftUI view to display the share sheet with `Open in Safari`
478+
479+
```swift
480+
Example:
481+
482+
.background(
483+
// Share button action
484+
SafariActivityView(isPresented: $activityPresented, url: url)
485+
)
486+
```
487+
488+
### .onFirstAppear
489+
490+
A SwiftUI view modifier that executes a block of code only once during the first display of the view
491+
492+
```swift
493+
.onFirstAppear(_ action: @escaping () -> ()) -> some View
494+
```
495+
487496
## License
488497

489498
Copyright (c) 2020 Darren Jones (Dappological Ltd.)

0 commit comments

Comments
 (0)