Skip to content

Commit 5d13f3b

Browse files
helje5helje5
committed
Merge branch 'develop'
2 parents dc98e27 + 1ba6e12 commit 5d13f3b

File tree

71 files changed

+3256
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3256
-87
lines changed

‎.gitignore‎

Lines changed: 10 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,13 @@
1-
# Xcode
2-
#
3-
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
4-
5-
## User settings
1+
.DS_Store
2+
/.build
3+
/Packages
64
xcuserdata/
7-
8-
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
9-
*.xcscmblueprint
10-
*.xccheckout
11-
12-
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
13-
build/
145
DerivedData/
15-
*.moved-aside
16-
*.pbxuser
17-
!default.pbxuser
18-
*.mode1v3
19-
!default.mode1v3
20-
*.mode2v3
21-
!default.mode2v3
22-
*.perspectivev3
23-
!default.perspectivev3
24-
25-
## Obj-C/Swift specific
26-
*.hmap
27-
28-
## App packaging
29-
*.ipa
30-
*.dSYM.zip
31-
*.dSYM
32-
33-
## Playgrounds
34-
timeline.xctimeline
35-
playground.xcworkspace
36-
37-
# Swift Package Manager
38-
#
39-
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
40-
# Packages/
41-
# Package.pins
42-
# Package.resolved
43-
# *.xcodeproj
44-
#
45-
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
46-
# hence it is not needed unless you have added a package configuration file to your project
47-
# .swiftpm
48-
49-
.build/
50-
51-
# CocoaPods
52-
#
53-
# We recommend against adding the Pods directory to your .gitignore. However
54-
# you should judge for yourself, the pros and cons are mentioned at:
55-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
56-
#
57-
# Pods/
58-
#
59-
# Add this line if you want to avoid checking in source code from the Xcode workspace
60-
# *.xcworkspace
61-
62-
# Carthage
63-
#
64-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
65-
# Carthage/Checkouts
66-
67-
Carthage/Build/
68-
69-
# Accio dependency management
70-
Dependencies/
71-
.accio/
72-
73-
# fastlane
74-
#
75-
# It is recommended to not store the screenshots in the git repo.
76-
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
77-
# For more information about the recommended setup visit:
78-
# https://docs.fastlane.tools/best-practices/source-control/#source-control
79-
80-
fastlane/report.xml
81-
fastlane/Preview.html
82-
fastlane/screenshots/**/*.png
83-
fastlane/test_output
84-
85-
# Code Injection
86-
#
87-
# After new code Injection tools there's a generated folder /iOSInjectionProject
88-
# https://github.com/johnno1962/injectionforxcode
6+
.swiftpm/config/registries.json
7+
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
8+
.netrc
9+
.swiftpm
10+
TestGeneration.txt
11+
.docker.build
12+
Package.resolved
8913

90-
iOSInjectionProject/

‎AppLogic/.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.DS_Store
2+
/.build
3+
/Packages
4+
/*.xcodeproj
5+
xcuserdata/
6+
DerivedData/
7+
.swiftpm/config/registries.json
8+
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
9+
.netrc

‎AppLogic/Package.swift‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// swift-tools-version: 5.7
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "AppLogic",
7+
8+
// This is required because the Northwind package has the same requirement.
9+
platforms: [ .macOS(.v10_15), .iOS(.v13) ],
10+
products: [
11+
.library(name: "WebDependencies", targets: [ "WebDependencies" ]),
12+
.library(name: "AppDependencies", targets: [ "AppDependencies" ])
13+
],
14+
15+
// The dependencies.
16+
dependencies: [
17+
.package(url: "[email protected]:55DB091A-8471-447B-8F50-5DFF4C1B14AC/Lighter.git",
18+
branch: "develop"),
19+
.package(url: "[email protected]:55DB091A-8471-447B-8F50-5DFF4C1B14AC/NorthwindSQLite.swift.git",
20+
branch: "develop"),
21+
22+
.package(url: "https://github.com/Macro-swift/MacroExpress.git",
23+
from: "0.8.8"),
24+
25+
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
26+
],
27+
28+
// Our own targets, those are linked by the Xcode project targets.
29+
targets: [
30+
.target(name: "WebDependencies", dependencies: [
31+
"MacroExpress",
32+
.product(name: "Northwind", package: "NorthwindSQLite.swift")
33+
]),
34+
.target(name: "AppDependencies", dependencies: [
35+
.product(name: "Northwind", package: "NorthwindSQLite.swift")
36+
])
37+
]
38+
)

‎AppLogic/README.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<h2>Lighter Examples AppLogic Helper
2+
<img src="https://zeezide.com/img/lighter/Lighter256.png"
3+
align="right" width="64" height="64" />
4+
</h2>
5+
6+
This is a helper package until Xcode 14 project level package dependencies
7+
properly run package plugins.
8+
9+
It is generally a good idea to manage Xcode package dependencies in such a
10+
local package.
11+
12+
Since the APIs require macOS 10.15 / iOS 13, this platforms declaration is
13+
usually needed in the [Package.swift](Package.swift):
14+
```swift
15+
platforms: [ .macOS(.v10_15), .iOS(.v13) ],
16+
```
17+
18+
### Who
19+
20+
Lighter is brought to you by
21+
[Helge Heß](https://github.com/helje5/) / [ZeeZide](https://zeezide.de).
22+
We like feedback, GitHub stars, cool contract work,
23+
presumably any form of praise you can think of.

‎AppLogic/Sources/AppDependencies/EmptyFile.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// This empty file is required to make SPM detect the target as Swift

‎AppLogic/Sources/WebDependencies/EmptyFile.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// This empty file is required to make SPM detect the target as Swift

‎Bodies/Assets.xcassets/AccentColor.colorset/Contents.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"colors" : [
3+
{
4+
"idiom" : "universal"
5+
}
6+
],
7+
"info" : {
8+
"author" : "xcode",
9+
"version" : 1
10+
}
11+
}

‎Bodies/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "EnlighterMobile.png",
5+
"idiom" : "universal",
6+
"platform" : "ios",
7+
"size" : "1024x1024"
8+
},
9+
{
10+
"idiom" : "mac",
11+
"scale" : "1x",
12+
"size" : "16x16"
13+
},
14+
{
15+
"idiom" : "mac",
16+
"scale" : "2x",
17+
"size" : "16x16"
18+
},
19+
{
20+
"filename" : "Enlighter32.png",
21+
"idiom" : "mac",
22+
"scale" : "1x",
23+
"size" : "32x32"
24+
},
25+
{
26+
"filename" : "[email protected]",
27+
"idiom" : "mac",
28+
"scale" : "2x",
29+
"size" : "32x32"
30+
},
31+
{
32+
"filename" : "Enlighter128.png",
33+
"idiom" : "mac",
34+
"scale" : "1x",
35+
"size" : "128x128"
36+
},
37+
{
38+
"filename" : "[email protected]",
39+
"idiom" : "mac",
40+
"scale" : "2x",
41+
"size" : "128x128"
42+
},
43+
{
44+
"filename" : "Enlighter256.png",
45+
"idiom" : "mac",
46+
"scale" : "1x",
47+
"size" : "256x256"
48+
},
49+
{
50+
"filename" : "[email protected]",
51+
"idiom" : "mac",
52+
"scale" : "2x",
53+
"size" : "256x256"
54+
},
55+
{
56+
"idiom" : "mac",
57+
"scale" : "1x",
58+
"size" : "512x512"
59+
},
60+
{
61+
"idiom" : "mac",
62+
"scale" : "2x",
63+
"size" : "512x512"
64+
}
65+
],
66+
"info" : {
67+
"author" : "xcode",
68+
"version" : 1
69+
}
70+
}

‎Bodies/Assets.xcassets/AppIcon.appiconset/Enlighter128.png‎

9.61 KB
Loading

‎Bodies/Assets.xcassets/AppIcon.appiconset/[email protected]‎

21.1 KB
Loading

0 commit comments

Comments
 (0)