Skip to content

Commit

Permalink
Update dependencies (#4)
Browse files Browse the repository at this point in the history
  • Loading branch information
atdrendel authored Nov 4, 2022
1 parent 8ed1f10 commit 7c233b2
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 38 deletions.
24 changes: 10 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
name: ci
name: CI

on: push

on:
push:
branches:
- main
pull_request:
branches:
- '*'

jobs:
build:
name: macOS
runs-on: macos-latest
test:
runs-on: macos-12

steps:
- uses: actions/checkout@v2
- name: Run tests
- uses: actions/checkout@v3
- name: Select Xcode 14
run: sudo xcode-select -s /Applications/Xcode_14.1.app
- name: Test
run: swift test
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
5.6.0
5.7.0

24 changes: 11 additions & 13 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"object": {
"pins": [
{
"package": "Synchronized",
"repositoryURL": "https://github.com/shareup/synchronized.git",
"state": {
"branch": null,
"revision": "ab58ad52ede004d65ee11b07aebb76392d9c0cec",
"version": "3.1.0"
}
"pins" : [
{
"identity" : "synchronized",
"kind" : "remoteSourceControl",
"location" : "https://github.com/shareup/synchronized.git",
"state" : {
"revision" : "3a07451bbd0933933804c7d9a92ef2fa57b6766f",
"version" : "4.0.0"
}
]
},
"version": 1
}
],
"version" : 2
}
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// swift-tools-version:5.6
// swift-tools-version:5.7
import PackageDescription

let package = Package(
name: "DispatchTimer",
platforms: [
.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v5),
.macOS(.v11), .iOS(.v14), .tvOS(.v14), .watchOS(.v7),
],
products: [
.library(
Expand All @@ -15,7 +15,7 @@ let package = Package(
dependencies: [
.package(
url: "https://github.com/shareup/synchronized.git",
from: "3.1.0"
from: "4.0.0"
),
],
targets: [
Expand Down
2 changes: 1 addition & 1 deletion Sources/DispatchTimer/DispatchTimer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public final class DispatchTimer: Sendable {
)

source.setEventHandler { [weak self] in
guard let self = self else { return }
guard let self else { return }
self.fire()

guard shouldRepeat else { return }
Expand Down
20 changes: 14 additions & 6 deletions bin/format.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
#!/usr/bin/env bash
# https://sharats.me/posts/shell-script-best-practices/

set -e
set -o errexit
set -o nounset
set -o pipefail
if [[ "${TRACE-0}" == "1" ]]; then
set -o xtrace
fi

SELF=`realpath $0`
DIR=`dirname $SELF`
DEV_DIR=`echo ${DIR%/*}`
if [[ "${1-}" =~ ^-*h(elp)?$ ]]; then
echo 'Usage: ./format.sh'
exit
fi

pushd "$DEV_DIR" &>/dev/null
DIR=`dirname "$0"`
pushd "$DIR/.." &>/dev/null

if command -v swiftformat >/dev/null 2>&1; then
swiftformat --quiet --config .swiftformat .
else
echo "warning: Install swiftformat by running 'brew install swiftformat'"
echo "warning: Install swiftformat by running 'brew install swiftformat'" >&2
fi

popd &>/dev/null

0 comments on commit 7c233b2

Please sign in to comment.