Skip to content

Commit

Permalink
Merge branch 'master' into remove-final
Browse files Browse the repository at this point in the history
  • Loading branch information
@Econa77
Econa77 authored Oct 9, 2023
2 parents 9869344 + c30d058 commit 8f1bca1
Show file tree
Hide file tree
Showing 9 changed files with 119 additions and 96 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/Danger.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ on: pull_request
jobs:
danger:

runs-on: macos-latest
runs-on: macos-13

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0

- name: Setup ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.6'
ruby-version: '3.2'

- name: Select Xcode
run: sudo xcode-select -s /Applications/Xcode_11.4.app
run: sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer

- name: Cache RubyGems
uses: actions/cache@v1
Expand Down Expand Up @@ -64,4 +64,4 @@ jobs:
env:
MINT_PATH: ${{ github.workspace }}/mint
MINT_LINK_PATH: ${{ github.workspace }}/mint/bin
SWIFTLINT_VERSION: 0.39.1
SWIFTLINT_VERSION: 0.53.0
20 changes: 12 additions & 8 deletions .github/workflows/Swift-Build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@ name: Swift-Build
on: [push, pull_request]
jobs:
test:
runs-on: macos-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-12, macos-13]
xcode: ['14.2', '15.0']
exclude:
- os: macos-12
xcode: '15.0'
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive

- name: Xcode select
run: sudo xcode-select -s /Applications/Xcode_11.4.app

- name: Build and Test
run: |
swift test
run: swift test
19 changes: 11 additions & 8 deletions .github/workflows/Xcode-Build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,30 @@ name: Xcode-Build
on: [push, pull_request]
jobs:
test:
runs-on: macos-latest
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-12, macos-13]
xcode: ['14.2', '15.0']
exclude:
- os: macos-12
xcode: '15.0'
env:
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive

- name: Xcode select
run: sudo xcode-select -s /Applications/Xcode_11.4.app

- name: Build and Test
run: |
set -o pipefail
xcodebuild build-for-testing test-without-building \
-workspace "$PROJECT" \
-scheme "$SCHEME" \
-sdk "$SDK" \
-destination "$DESTINATION" \
-configuration Debug \
ENABLE_TESTABILITY=YES | xcpretty -c;
env:
PROJECT: Magnet.xcworkspace
SCHEME: Magnet
SDK: macosx
DESTINATION: arch=x86_64
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Clipy/Sauce" "v2.2.0"
github "Clipy/Sauce" "v2.4.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Sauce
Submodule Sauce updated 15 files
+6 −6 .github/workflows/Danger.yml
+12 −8 .github/workflows/Swift-Build.yml
+11 −8 .github/workflows/Xcode-Build.yml
+42 −51 Example/Example.xcodeproj/project.pbxproj
+3 −3 Example/Example/ViewController.swift
+79 −53 Gemfile.lock
+5 −3 Lib/Sauce.xcodeproj/project.pbxproj
+10 −14 Lib/Sauce.xcodeproj/xcshareddata/xcschemes/Sauce.xcscheme
+1 −1 Lib/Sauce/Info.plist
+3 −1 Lib/Sauce/InputSource.swift
+1 −1 Lib/Sauce/KeyboardLayout.swift
+14 −3 Lib/SauceTests/KeyboardLayoutTests.swift
+1 −1 Package.swift
+4 −8 README.md
+2 −2 Sauce.podspec
4 changes: 2 additions & 2 deletions Example/Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -336,7 +336,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
148 changes: 82 additions & 66 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,136 +1,152 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (4.2.11.3)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.2)
CFPropertyList (3.0.6)
rexml
activesupport (7.1.0)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
base64 (0.1.1)
bigdecimal (3.1.4)
claide (1.1.0)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
cocoapods (1.9.2)
activesupport (>= 4.0.2, < 5)
cocoapods (1.13.0)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.2)
cocoapods-core (= 1.13.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-downloader (>= 1.6.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.2)
activesupport (>= 4.0.2, < 6)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.13.0)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.6.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.5.0)
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
cork (0.3.0)
colored2 (~> 3.1)
danger (8.0.0)
danger (9.3.2)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (>= 0.9.0, < 2.0)
faraday (>= 0.9.0, < 3.0)
faraday-http-cache (~> 2.0)
git (~> 1.7)
kramdown (~> 2.0)
git (~> 1.13)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
danger-swiftlint (0.24.2)
octokit (~> 6.0)
terminal-table (>= 1, < 4)
danger-swiftlint (0.33.0)
danger
rake (> 10)
thor (~> 0.19)
drb (2.1.1)
ruby2_keywords
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.2.0)
ethon (0.16.0)
ffi (>= 1.15.0)
faraday (2.7.11)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-http-cache (2.5.0)
faraday (>= 0.8)
ffi (1.12.2)
faraday-net_http (3.0.2)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.7.0)
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
httpclient (2.8.3)
i18n (0.9.5)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
json (2.3.0)
kramdown (2.3.1)
json (2.6.3)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
minitest (5.14.1)
molinillo (0.6.6)
multipart-post (2.1.1)
nanaimo (0.2.6)
minitest (5.20.0)
molinillo (0.8.0)
mutex_m (0.1.2)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
no_proxy_fix (0.1.2)
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
octokit (6.1.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
open4 (1.3.4)
public_suffix (4.0.6)
rake (13.0.1)
public_suffix (4.0.7)
rake (13.0.6)
rchardet (1.8.0)
rexml (3.2.5)
ruby-macho (1.4.0)
sawyer (0.8.2)
rexml (3.2.6)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
faraday (>= 0.17.3, < 3)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (0.20.3)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
xcodeproj (1.16.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
xcodeproj (1.23.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)

PLATFORMS
ruby
Expand All @@ -141,4 +157,4 @@ DEPENDENCIES
danger-swiftlint

BUNDLED WITH
2.1.4
2.3.5
4 changes: 2 additions & 2 deletions Lib/Magnet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
Expand Down Expand Up @@ -441,7 +441,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import PackageDescription
let package = Package(
name: "Magnet",
platforms: [
.macOS(.v10_10)
.macOS(.v10_13)
],
products: [
.library(
name: "Magnet",
targets: ["Magnet"]),
],
dependencies: [
.package(url: "https://github.com/Clipy/Sauce", .upToNextMinor(from: "2.2.0")),
.package(url: "https://github.com/Clipy/Sauce", .upToNextMinor(from: "2.4.0")),
],
targets: [
.target(
Expand Down

0 comments on commit 8f1bca1

Please sign in to comment.