Skip to content

Commit

Permalink
Merge branch 'development' into js-layouts
Browse files Browse the repository at this point in the history 
* development:
  add regex suuport to floating windows title matching (#1166)
  Get the build going (#1185)
  Fix for move to window to space - #1174 (#1184)
  Update cocoapods in Gemfile (#1159)
  • Loading branch information
@ianyh
ianyh committed Jan 21, 2022
2 parents 87cf288 + 7a33529 commit 514843e
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 45 deletions.
3 changes: 2 additions & 1 deletion Amethyst/Model/Window.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,9 @@ extension AXWindow: WindowType {
func move(toSpace spaceID: CGSSpaceID) {
let currentSpace = CGSGetActiveSpace(CGSMainConnectionID())
let ids = [cgID()]
CGSRemoveWindowsFromSpaces(CGSMainConnectionID(), ids as CFArray, [currentSpace] as CFArray)

CGSAddWindowsToSpaces(CGSMainConnectionID(), ids as CFArray, [spaceID] as CFArray)
CGSRemoveWindowsFromSpaces(CGSMainConnectionID(), ids as CFArray, [currentSpace] as CFArray)

if UserConfiguration.shared.followWindowsThrownBetweenSpaces() {
focus()
Expand Down
8 changes: 7 additions & 1 deletion Amethyst/Preferences/UserConfiguration.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,13 @@ class UserConfiguration: NSObject {
// If the title matches it is included
// - Blacklist means floating
// - Whitelist means not floating
if floatingBundle.windowTitles.contains(title) {
if floatingBundle.windowTitles.contains(where: { windowTitle in
if title.range(of: windowTitle, options: .regularExpression) != nil {
return true
} else {
return false
}
}) {
return .reliable(DefaultFloat.from(useIdentifiersAsBlacklist))
}

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source "https://rubygems.org"

gem 'cocoapods', '= 1.10.1'
gem 'cocoapods'
gem 'fastlane'
gem 'xcpretty'
70 changes: 37 additions & 33 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (5.2.6)
CFPropertyList (3.0.5)
rexml
activesupport (6.1.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
Expand All @@ -30,11 +32,11 @@ GEM
aws-sigv4 (1.2.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.3)
claide (1.0.3)
cocoapods (1.10.1)
addressable (~> 2.6)
claide (1.1.0)
cocoapods (1.11.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.1)
cocoapods-core (= 1.11.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -45,26 +47,26 @@ GEM
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.19.0, < 2.0)
cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.2)
activesupport (>= 5.0, < 7)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.4.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.5.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.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)
Expand All @@ -82,7 +84,7 @@ GEM
dotenv (2.7.6)
emoji_regex (3.0.0)
escape (0.0.4)
ethon (0.14.0)
ethon (0.15.0)
ffi (>= 1.15.0)
excon (0.76.0)
faraday (1.0.1)
Expand Down Expand Up @@ -129,7 +131,7 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
ffi (1.15.1)
ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
Expand Down Expand Up @@ -165,16 +167,16 @@ GEM
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.8.10)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
json (2.3.1)
json (2.6.1)
jwt (2.2.1)
memoist (0.16.2)
mini_magick (4.10.1)
mini_mime (1.0.2)
minitest (5.14.4)
molinillo (0.6.6)
minitest (5.15.0)
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.0.0)
nanaimo (0.3.0)
Expand All @@ -190,8 +192,9 @@ GEM
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.5)
rouge (2.0.7)
ruby-macho (1.4.0)
ruby-macho (2.5.1)
rubyzip (2.3.0)
security (0.1.3)
signet (0.14.0)
Expand All @@ -206,39 +209,40 @@ GEM
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tty-cursor (0.7.1)
tty-screen (0.8.1)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
word_wrap (1.0.0)
xcodeproj (1.19.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.0)
xcpretty (~> 0.2, >= 0.0.7)
zeitwerk (2.5.3)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.10.1)
cocoapods
fastlane
xcpretty

BUNDLED WITH
2.2.19
2.2.27
2 changes: 1 addition & 1 deletion Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use_frameworks!

target 'Amethyst' do
pod 'Cartography'
pod 'LoginServiceKit', :git => 'https://github.com/Clipy/LoginServiceKit.git'
pod 'LoginServiceKit', :git => 'https://github.com/Sunnyyoung/LoginServiceKit.git'
pod 'MASShortcut'
pod 'RxCocoa'
pod 'RxSwift'
Expand Down
16 changes: 8 additions & 8 deletions Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- Cartography (4.0.0)
- LoginServiceKit (2.0.2)
- LoginServiceKit (2.2.1)
- MASShortcut (2.4.0)
- Nimble (9.0.1)
- Quick (4.0.0)
Expand All @@ -25,7 +25,7 @@ PODS:

DEPENDENCIES:
- Cartography
- LoginServiceKit (from `https://github.com/Clipy/LoginServiceKit.git`)
- LoginServiceKit (from `https://github.com/Sunnyyoung/LoginServiceKit.git`)
- MASShortcut
- Nimble (~> 9.0.1)
- Quick (~> 4.0.0)
Expand Down Expand Up @@ -53,23 +53,23 @@ SPEC REPOS:

EXTERNAL SOURCES:
LoginServiceKit:
:git: https://github.com/Clipy/LoginServiceKit.git
:git: https://github.com/Sunnyyoung/LoginServiceKit.git
Silica:
:git: https://github.com/ianyh/Silica
:submodules: true

CHECKOUT OPTIONS:
LoginServiceKit:
:commit: 79c9d6d2cc25dc238e6044245bebdc8253a786f2
:git: https://github.com/Clipy/LoginServiceKit.git
:commit: 04a1379908432bc4e304b38c831d573b1943b3fa
:git: https://github.com/Sunnyyoung/LoginServiceKit.git
Silica:
:commit: fd2c3a469d4e8855c26a1fe0769af2c0cad9f1fb
:git: https://github.com/ianyh/Silica
:submodules: true

SPEC CHECKSUMS:
Cartography: c5626d29056b20f1e95c017326ee4df57cc39ad8
LoginServiceKit: 5b4736234dc4cc96d786d8cd83e43b9ce5e7f1ca
LoginServiceKit: e39022a6ea6169b3716fc3c43e89b2e7fd12f222
MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
Nimble: 7bed62ffabd6dbfe05f5925cbc43722533248990
Quick: 6473349e43b9271a8d43839d9ba1c442ed1b7ac4
Expand All @@ -82,6 +82,6 @@ SPEC CHECKSUMS:
SwiftyBeaver: f9a9aba96a6a6166e21682377804d728b0d20b95
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7

PODFILE CHECKSUM: 7c25b423e2dbd7afb667fcb9f2d43dc98411bba9
PODFILE CHECKSUM: e40f10ab3ee06f2055a47b7b06e4964c47015f89

COCOAPODS: 1.10.2
COCOAPODS: 1.11.2

0 comments on commit 514843e

Please sign in to comment.