diff --git a/Podfile b/Podfile index bdc38999..839efd78 100644 --- a/Podfile +++ b/Podfile @@ -4,7 +4,7 @@ target 'alt-tab-macos' do use_frameworks! pod 'LetsMove', :git => 'https://github.com/lwouis/LetsMove.git', :commit => '7abf4daed1a25218f2b52f2dfd190aee5a50071c' pod 'Sparkle', :podspec => 'https://raw.githubusercontent.com/lwouis/Sparkle/fix-iframe-popup-1.24/Sparkle.podspec' - pod 'ShortcutRecorder', :git => 'https://github.com/Kentzo/ShortcutRecorder.git', :commit => 'f718220854575bad86fa89dd2bb3decd0b14b2b0' + pod 'ShortcutRecorder', :git => 'https://github.com/lwouis/ShortcutRecorder.git', :branch => 'alt-tab-current' pod 'SwiftyMarkdown', '1.1.0' pod 'AppCenter/Crashes', '4.3.0' end diff --git a/Podfile.lock b/Podfile.lock index 57b71260..bff9d006 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -10,7 +10,7 @@ PODS: DEPENDENCIES: - AppCenter/Crashes (= 4.3.0) - LetsMove (from `https://github.com/lwouis/LetsMove.git`, commit `7abf4daed1a25218f2b52f2dfd190aee5a50071c`) - - ShortcutRecorder (from `https://github.com/Kentzo/ShortcutRecorder.git`, commit `f718220854575bad86fa89dd2bb3decd0b14b2b0`) + - ShortcutRecorder (from `https://github.com/lwouis/ShortcutRecorder.git`, branch `alt-tab-current`) - Sparkle (from `https://raw.githubusercontent.com/lwouis/Sparkle/fix-iframe-popup-1.24/Sparkle.podspec`) - SwiftyMarkdown (= 1.1.0) @@ -24,8 +24,8 @@ EXTERNAL SOURCES: :commit: 7abf4daed1a25218f2b52f2dfd190aee5a50071c :git: https://github.com/lwouis/LetsMove.git ShortcutRecorder: - :commit: f718220854575bad86fa89dd2bb3decd0b14b2b0 - :git: https://github.com/Kentzo/ShortcutRecorder.git + :branch: alt-tab-current + :git: https://github.com/lwouis/ShortcutRecorder.git Sparkle: :podspec: https://raw.githubusercontent.com/lwouis/Sparkle/fix-iframe-popup-1.24/Sparkle.podspec @@ -34,8 +34,8 @@ CHECKOUT OPTIONS: :commit: 7abf4daed1a25218f2b52f2dfd190aee5a50071c :git: https://github.com/lwouis/LetsMove.git ShortcutRecorder: - :commit: f718220854575bad86fa89dd2bb3decd0b14b2b0 - :git: https://github.com/Kentzo/ShortcutRecorder.git + :commit: 5bb32febdab48038ce1762bf14f5ce8024b11fe7 + :git: https://github.com/lwouis/ShortcutRecorder.git SPEC CHECKSUMS: AppCenter: 883369ab78427b0561c688158d689dfe1f993ea9 @@ -44,6 +44,6 @@ SPEC CHECKSUMS: Sparkle: 1fa490bb4ab2a9b37cfb9ea4feec19dd33b81cd2 SwiftyMarkdown: 033abc9dad9a37903f81aec5188cade436f40520 -PODFILE CHECKSUM: 221e0c8a87ed30b40d9d155eb61d139c2205b497 +PODFILE CHECKSUM: db137cd4263235b552493949169a44f7e874a90f COCOAPODS: 1.9.1 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 57b71260..bff9d006 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -10,7 +10,7 @@ PODS: DEPENDENCIES: - AppCenter/Crashes (= 4.3.0) - LetsMove (from `https://github.com/lwouis/LetsMove.git`, commit `7abf4daed1a25218f2b52f2dfd190aee5a50071c`) - - ShortcutRecorder (from `https://github.com/Kentzo/ShortcutRecorder.git`, commit `f718220854575bad86fa89dd2bb3decd0b14b2b0`) + - ShortcutRecorder (from `https://github.com/lwouis/ShortcutRecorder.git`, branch `alt-tab-current`) - Sparkle (from `https://raw.githubusercontent.com/lwouis/Sparkle/fix-iframe-popup-1.24/Sparkle.podspec`) - SwiftyMarkdown (= 1.1.0) @@ -24,8 +24,8 @@ EXTERNAL SOURCES: :commit: 7abf4daed1a25218f2b52f2dfd190aee5a50071c :git: https://github.com/lwouis/LetsMove.git ShortcutRecorder: - :commit: f718220854575bad86fa89dd2bb3decd0b14b2b0 - :git: https://github.com/Kentzo/ShortcutRecorder.git + :branch: alt-tab-current + :git: https://github.com/lwouis/ShortcutRecorder.git Sparkle: :podspec: https://raw.githubusercontent.com/lwouis/Sparkle/fix-iframe-popup-1.24/Sparkle.podspec @@ -34,8 +34,8 @@ CHECKOUT OPTIONS: :commit: 7abf4daed1a25218f2b52f2dfd190aee5a50071c :git: https://github.com/lwouis/LetsMove.git ShortcutRecorder: - :commit: f718220854575bad86fa89dd2bb3decd0b14b2b0 - :git: https://github.com/Kentzo/ShortcutRecorder.git + :commit: 5bb32febdab48038ce1762bf14f5ce8024b11fe7 + :git: https://github.com/lwouis/ShortcutRecorder.git SPEC CHECKSUMS: AppCenter: 883369ab78427b0561c688158d689dfe1f993ea9 @@ -44,6 +44,6 @@ SPEC CHECKSUMS: Sparkle: 1fa490bb4ab2a9b37cfb9ea4feec19dd33b81cd2 SwiftyMarkdown: 033abc9dad9a37903f81aec5188cade436f40520 -PODFILE CHECKSUM: 221e0c8a87ed30b40d9d155eb61d139c2205b497 +PODFILE CHECKSUM: db137cd4263235b552493949169a44f7e874a90f COCOAPODS: 1.9.1 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 8447f502..dd2bf9e0 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -842,8 +842,8 @@ BFDFE7DC352907FC980B868725387E98 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1240; + LastSwiftUpdateCheck = 1300; + LastUpgradeCheck = 1300; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; diff --git a/Pods/ShortcutRecorder/Library/SRKeyCodeTransformer.m b/Pods/ShortcutRecorder/Library/SRKeyCodeTransformer.m index 650aed19..e2a7b169 100644 --- a/Pods/ShortcutRecorder/Library/SRKeyCodeTransformer.m +++ b/Pods/ShortcutRecorder/Library/SRKeyCodeTransformer.m @@ -318,6 +318,10 @@ typedef TISInputSourceRef (*_SRKeyCodeTransformerCacheInputSourceCreate)(void); explicitModifierFlags:0 usingCache:YES]; + // fix: https://github.com/lwouis/alt-tab-macos/issues/1190 + if (newTranslationToKeyCode[translation]) + continue; + if (translation.length) newTranslationToKeyCode[translation] = keyCode; } diff --git a/Pods/Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-acknowledgements.plist b/Pods/Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-acknowledgements.plist index db7dd154..ea3b4718 100644 --- a/Pods/Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos-acknowledgements.plist @@ -372,7 +372,7 @@ Section 8 -- Interpretation. Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances -will be considered the Licensor. The text of the Creative Commons +will be considered the “Licensor.” The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as @@ -397,7 +397,7 @@ public licenses. FooterText Copyright (c) 2006-2013 Andy Matuschak. Copyright (c) 2009-2013 Elgato Systems GmbH. -Copyright (c) 2011-2014 Kornel Lesiski. +Copyright (c) 2011-2014 Kornel Lesiński. Copyright (c) 2015-2017 Mayur Pawashe. Copyright (c) 2014 C.W. Betts. Copyright (c) 2014 Petroules Corporation.