Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding support for macOS by using shims (feature branch) #141

Open
wants to merge 52 commits into
base: feature/macOS
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
23276c0
Adds support for macOS.
Feb 8, 2017
3a8e7d3
Fixes the glitches of rounded corners on a VisualEffectView
Feb 14, 2017
5d5f89a
removing hitTest override for macOS as it is not working anyway
Feb 14, 2017
701a49c
Fix closing path issue for macOS
Feb 14, 2017
cd003f0
Fixes hidden system activity indicator on mac
Feb 14, 2017
2f5e970
change blending mode depending on using 10.11 or 10.12
Feb 24, 2017
19aef34
Fix wrong travis badge
Feb 24, 2017
422578a
Update Travis badge
Feb 24, 2017
98001e1
Update README to Swift3
Feb 24, 2017
e414e82
Add .swift-version
Feb 24, 2017
11ed44a
Remove broken badge
Feb 24, 2017
8fef55f
Add Credits section
Feb 24, 2017
f52f5a7
fixing black artifacts for macOS VisualEffectView
Mar 6, 2017
64749af
Fix some castings of `.pi`
LaurentiuUngur Mar 28, 2017
c97be67
Merge pull request #150 from LaurentiuUngur/fixes
PGLongo Mar 29, 2017
e7b953a
Remove swiftlint from Travis
Mar 29, 2017
24eb1b0
Update fastlane to last version
Mar 31, 2017
311e8ed
Bump version to 4.2.1
Mar 31, 2017
9e71ba7
Update osx_image to xcode8.3 in .travis
Apr 7, 2017
4330230
fix: set isHidden to true on start for accurate status
Veronique May 9, 2017
4e8f15c
fix: reduce the time interval on tests to address CI time-out failure
Veronique May 9, 2017
712af7f
fix: increase the time interval to 3.5
Veronique May 9, 2017
95a82d3
Merge pull request #165 from Veronique/window-hidden-on-start
PGLongo May 9, 2017
f8f13db
Bump version to 4.2.2
May 10, 2017
9e8dcc0
Add test for initial isVisible thanks to @paddlefish
PGLongo May 11, 2017
77035b1
Increase time in waitForHudToAppear for Travis issue
PGLongo May 11, 2017
6ec3e33
Add gracePeriod and deprecated graceTime
PGLongo May 11, 2017
b1093ba
Fix add subview to UIVisualEffectView
RoCry Jun 6, 2017
8143ac8
Merge pull request #169 from RoCry/master
PGLongo Jun 12, 2017
99b0cb4
Merge pull request #168 from pkluz/graceTime-improvement
PGLongo Jun 12, 2017
ef8c46d
Updated README.md with Swift4 branch
PGLongo Jun 12, 2017
36c0fe2
Bump version to 4.2.3
PGLongo Jun 12, 2017
bef39d3
Update iOS 10 destination to 10.3
PGLongo Jun 13, 2017
1273c2f
Add pod lib lint in .travis
PGLongo Jun 13, 2017
4360790
Replace iPhone 7 Plus with iPhone 7 in .travis
PGLongo Jun 14, 2017
852423e
Exposing old objc API methods using #selector to @objc
thibauddavid Jun 16, 2017
3fb1f53
Merge pull request #175 from thibauddavid/release/swift4
PGLongo Jun 19, 2017
4d8fbf7
Update project to Xcode 9 beta 5
Aug 11, 2017
21fc6de
Fix add subview to UIVisualEffectView
RoCry Jun 6, 2017
69fa94c
Merge pull request #199 from pkluz/release/swift4
PGLongo Sep 20, 2017
b1788ae
Re-indent Ruby code in README.md
dankimio Oct 1, 2017
b043459
Merge pull request #204 from dankimio/patch-1
PGLongo Oct 2, 2017
38a1abb
Upgrade travis to xcode9
Oct 2, 2017
b4d5d54
Update iOS SDK in .travis.yml
Oct 2, 2017
a1acaf3
Add iOS11 support in .travis
Oct 2, 2017
dfadd0c
Add .swift-version
Oct 3, 2017
79a88a2
Merge pull request #206 from pkluz/travis-upgrade
PGLongo Oct 3, 2017
5c22c59
Update readme for swift4 support
Oct 4, 2017
8cb1192
Fix style with SwiftLint
Oct 4, 2017
4f98d2d
Update Gemfile
Oct 4, 2017
492f82b
Update to version 5.0.0
Oct 4, 2017
3bfd247
Merge branch 'version5.0' into macOSBasedOn4.2.0
Jul 20, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.0
15 changes: 7 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
language: objective-c
osx_image: xcode8
osx_image: xcode9
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- PROJECT=PKHUD.xcodeproj
- IOS_SDK=iphonesimulator10.0
- IOS_SDK=iphonesimulator11.0
- IOS_FRAMEWORK_SCHEME="PKHUD"
- EXAMPLE_SCHEME="PKHUD Demo"
- UITEST_SCHEME="PKHUDDemoUITests"
matrix:
- DESTINATION="OS=10.0,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
- DESTINATION="OS=11.0,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
- DESTINATION="OS=11.0,name=iPhone 8" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
- DESTINATION="OS=10.3.1,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
- DESTINATION="OS=9.0,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
- DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="NO" BUILD_EXAMPLE="YES" POD_LINT="NO"
before_install:
Expand All @@ -20,9 +22,6 @@ script:
- xcodebuild -version
- xcodebuild -showsdks
- xcodebuild -list
- brew update
- brew outdated xctool || brew upgrade swiftlint
- swiftlint version

# Build Framework in Debug and Run Tests if specified
- if [ $RUN_TESTS == "YES" ]; then
Expand All @@ -43,7 +42,7 @@ script:
xcodebuild -project "$PROJECT" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
fi

# Run `pod lib lint` if specified
# Run `pod lib lint` if specified
- if [ $POD_LINT == "YES" ]; then
pod lib lint;
fi
fi
1 change: 1 addition & 0 deletions Demo/.swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0
2 changes: 1 addition & 1 deletion Demo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.2.0</string>
<string>5.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
source "https://rubygems.org"

gem "fastlane"
gem "cocoapods"
85 changes: 63 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,40 +1,72 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.4)
activesupport (4.2.7.1)
CFPropertyList (2.3.5)
activesupport (4.2.8)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.0)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
babosa (1.0.2)
claide (1.0.1)
cocoapods (1.2.0)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.2.0)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.3, < 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.1.2, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.5.5)
nap (~> 1.0)
ruby-macho (~> 0.2.5)
xcodeproj (>= 1.4.1, < 2.0)
cocoapods-core (1.2.0)
activesupport (>= 4.0.2, < 5)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.1)
cocoapods-downloader (1.1.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.3.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored (1.2)
commander (4.4.3)
commander-fastlane (4.4.4)
highline (~> 1.7.2)
domain_name (0.5.20161129)
domain_name (0.5.20170223)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.1.2)
excon (0.54.0)
dotenv (2.2.0)
escape (0.0.4)
excon (0.55.0)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.11.0)
faraday_middleware (0.11.0.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.0.1)
addressable (~> 2)
fastlane (2.9.0)
fastimage (2.1.0)
fastlane (2.24.0)
activesupport (< 5)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (~> 1.12)
bundler (>= 1.12.0, < 2.0.0)
colored
commander (>= 4.4.0, < 5.0.0)
commander-fastlane (>= 4.4.0, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
Expand All @@ -55,12 +87,15 @@ GEM
slack-notifier (>= 1.3, < 2.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (~> 0.5.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 0.20, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
xcpretty-travis-formatter (>= 0.0.3)
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.0.3)
google-api-client (0.9.23)
google-api-client (0.9.28)
addressable (~> 2.3)
googleauth (~> 0.5)
httpclient (~> 2.7)
Expand All @@ -82,11 +117,11 @@ GEM
domain_name (~> 0.5)
httpclient (2.8.3)
hurley (0.2)
i18n (0.7.0)
json (1.8.6)
i18n (0.8.1)
json (2.0.3)
jwt (1.5.6)
little-plugger (1.1.4)
logging (2.1.0)
logging (2.2.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
memoist (0.15.0)
Expand All @@ -95,18 +130,22 @@ GEM
mime-types-data (3.2016.0521)
mini_magick (4.5.1)
minitest (5.10.1)
molinillo (0.5.7)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.3)
nap (1.1.0)
netrc (0.11.0)
os (0.9.6)
plist (3.2.0)
public_suffix (2.0.5)
representable (2.3.0)
uber (~> 0.0.7)
retriable (2.1.0)
rouge (1.11.1)
rubyzip (1.2.0)
ruby-macho (0.2.6)
rubyzip (1.2.1)
security (0.1.3)
signet (0.7.3)
addressable (~> 2.3)
Expand All @@ -117,8 +156,9 @@ GEM
terminal-notifier (1.7.1)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (0.3.6)
tty-screen (0.5.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uber (0.0.15)
unf (0.1.4)
Expand All @@ -141,7 +181,8 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods
fastlane

BUNDLED WITH
1.14.0
1.15.4
9 changes: 5 additions & 4 deletions PKHUD.podspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Pod::Spec.new do |s|
s.name = 'PKHUD'
s.module_name = 'PKHUD'
s.version = '4.2.0'
s.summary = 'A Swift 3 based reimplementation of the Apple HUD (Volume, Ringer, Rotation,…) for iOS 8 and up'
s.version = '5.0.0'
s.summary = 'A Swift 4 based reimplementation of the Apple HUD (Volume, Ringer, Rotation,…) for iOS 8/macOS 10.11 and up'
s.homepage = 'https://github.com/pkluz/PKHUD'
s.license = 'MIT'
s.author = { 'Philip Kluz' => '[email protected]' }
s.platform = :ios, '8.0'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.requires_arc = true
s.source = { :git => 'https://github.com/pkluz/PKHUD.git', :tag => s.version.to_s }
s.source_files = 'PKHUD/**/*.{h,swift}'
s.source_files = 'PKHUD/**/*.swift'
s.osx.source_files = 'PKHUDMACOS/**/*.swift'
s.resources = 'PKHUD/*.xcassets'
end
Loading