Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
helje5 committed Aug 16, 2022
2 parents dc98e27 + 1ba6e12 commit 5d13f3b
Show file tree
Hide file tree
Showing 71 changed files with 3,256 additions and 87 deletions.
97 changes: 10 additions & 87 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,90 +1,13 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
.DS_Store
/.build
/Packages
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3

## Obj-C/Swift specific
*.hmap

## App packaging
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
# *.xcodeproj
#
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build/

# Accio dependency management
Dependencies/
.accio/

# fastlane
#
# It is recommended to not store the screenshots in the git repo.
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode
.swiftpm/config/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
.swiftpm
TestGeneration.txt
.docker.build
Package.resolved

iOSInjectionProject/
9 changes: 9 additions & 0 deletions AppLogic/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.DS_Store
/.build
/Packages
/*.xcodeproj
xcuserdata/
DerivedData/
.swiftpm/config/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
38 changes: 38 additions & 0 deletions AppLogic/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// swift-tools-version: 5.7

import PackageDescription

let package = Package(
name: "AppLogic",

// This is required because the Northwind package has the same requirement.
platforms: [ .macOS(.v10_15), .iOS(.v13) ],
products: [
.library(name: "WebDependencies", targets: [ "WebDependencies" ]),
.library(name: "AppDependencies", targets: [ "AppDependencies" ])
],

// The dependencies.
dependencies: [
.package(url: "git@github.com:55DB091A-8471-447B-8F50-5DFF4C1B14AC/Lighter.git",
branch: "develop"),
.package(url: "git@github.com:55DB091A-8471-447B-8F50-5DFF4C1B14AC/NorthwindSQLite.swift.git",
branch: "develop"),

.package(url: "https://github.com/Macro-swift/MacroExpress.git",
from: "0.8.8"),

.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0")
],

// Our own targets, those are linked by the Xcode project targets.
targets: [
.target(name: "WebDependencies", dependencies: [
"MacroExpress",
.product(name: "Northwind", package: "NorthwindSQLite.swift")
]),
.target(name: "AppDependencies", dependencies: [
.product(name: "Northwind", package: "NorthwindSQLite.swift")
])
]
)
23 changes: 23 additions & 0 deletions AppLogic/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<h2>Lighter Examples AppLogic Helper
<img src="https://zeezide.com/img/lighter/Lighter256.png"
align="right" width="64" height="64" />
</h2>

This is a helper package until Xcode 14 project level package dependencies
properly run package plugins.

It is generally a good idea to manage Xcode package dependencies in such a
local package.

Since the APIs require macOS 10.15 / iOS 13, this platforms declaration is
usually needed in the [Package.swift](Package.swift):
```swift
platforms: [ .macOS(.v10_15), .iOS(.v13) ],
```

### Who

Lighter is brought to you by
[Helge Heß](https://github.com/helje5/) / [ZeeZide](https://zeezide.de).
We like feedback, GitHub stars, cool contract work,
presumably any form of praise you can think of.
1 change: 1 addition & 0 deletions AppLogic/Sources/AppDependencies/EmptyFile.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// This empty file is required to make SPM detect the target as Swift
1 change: 1 addition & 0 deletions AppLogic/Sources/WebDependencies/EmptyFile.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// This empty file is required to make SPM detect the target as Swift
11 changes: 11 additions & 0 deletions Bodies/Assets.xcassets/AccentColor.colorset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"colors" : [
{
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
70 changes: 70 additions & 0 deletions Bodies/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"images" : [
{
"filename" : "EnlighterMobile.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"filename" : "Enlighter32.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"filename" : "Enlighter32@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"filename" : "Enlighter128.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"filename" : "Enlighter128@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"filename" : "Enlighter256.png",
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"filename" : "Enlighter256@2x.png",
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions Bodies/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
12 changes: 12 additions & 0 deletions Bodies/Bodies.entitlements
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
</dict>
</plist>
6 changes: 6 additions & 0 deletions Bodies/Preview Content/Preview Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Legal

By submitting a pull request, you represent that you have the right to license
your contribution to ZeeZide GmbH and the community, and agree by submitting the
patch that your contributions are licensed under the Apache 2.0 license.

0 comments on commit 5d13f3b

Please sign in to comment.