Skip to content

Commit

Permalink
Merge pull request #30 from kyan/release/tag1_6
Browse files Browse the repository at this point in the history
release 1.6
  • Loading branch information
whomwah committed Dec 24, 2015
2 parents 86c50e1 + b0c8ef3 commit 0e1469b
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rake'
gem 'cocoapods', '= 0.37.2'
gem "motion-cocoapods"
gem 'afmotion'
gem "motion-sparkle"
Expand All @@ -10,4 +10,4 @@ gem 'sugarcube', :require => [
]
gem "ib"
#gem "kyan_jukebox_websocket_lib", :path => "/Users/duncan/_dev/kyan/gems/kyan_jukebox_websocket_lib"
gem "kyan_jukebox", :git => '[email protected]:kyan/kyan_jukebox_websocket_lib.git'
gem "kyan_jukebox", :git => '[email protected]:kyan/kyan_jukebox_websocket_lib.git'
52 changes: 26 additions & 26 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.0)
activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -19,32 +19,31 @@ GEM
bubble-wrap (1.7.1)
bubble-wrap-http (= 1.7.1)
bubble-wrap-http (1.7.1)
claide (0.7.0)
cocoapods (0.35.0)
claide (0.8.2)
cocoapods (0.37.2)
activesupport (>= 3.2.15)
claide (~> 0.7.0)
cocoapods-core (= 0.35.0)
cocoapods-downloader (~> 0.8.0)
cocoapods-plugins (~> 0.3.1)
cocoapods-trunk (~> 0.4.1)
cocoapods-try (~> 0.4.2)
claide (~> 0.8.1)
cocoapods-core (= 0.37.2)
cocoapods-downloader (~> 0.9.0)
cocoapods-plugins (~> 0.4.2)
cocoapods-trunk (~> 0.6.1)
cocoapods-try (~> 0.4.5)
colored (~> 1.2)
escape (~> 0.0.4)
molinillo (~> 0.1.2)
molinillo (~> 0.2.3)
nap (~> 0.8)
open4 (~> 1.3)
xcodeproj (~> 0.20.2)
cocoapods-core (0.35.0)
xcodeproj (~> 0.24.2)
cocoapods-core (0.37.2)
activesupport (>= 3.2.15)
fuzzy_match (~> 2.0.4)
nap (~> 0.8.0)
cocoapods-downloader (0.8.1)
cocoapods-plugins (0.3.2)
cocoapods-downloader (0.9.3)
cocoapods-plugins (0.4.2)
nap
cocoapods-trunk (0.4.1)
nap (>= 0.8)
cocoapods-trunk (0.6.4)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (0.4.3)
cocoapods-try (0.4.5)
colored (1.2)
escape (0.0.4)
fuzzy_match (2.0.4)
Expand All @@ -53,24 +52,22 @@ GEM
thor (~> 0.15.4)
tilt (~> 1.4.1)
xcodeproj (~> 0.17)
json (1.8.2)
minitest (5.5.1)
molinillo (0.1.2)
json (1.8.3)
minitest (5.8.3)
molinillo (0.2.3)
motion-cocoapods (1.7.0)
cocoapods (>= 0.34)
motion-require (0.2.0)
motion-sparkle (0.0.5)
nap (0.8.0)
netrc (0.7.8)
open4 (1.3.4)
rake (10.4.2)
sugarcube (3.1.1)
thor (0.15.4)
thread_safe (0.3.4)
thread_safe (0.3.5)
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (0.20.2)
xcodeproj (0.24.3)
activesupport (>= 3)
colored (~> 1.2)

Expand All @@ -80,9 +77,12 @@ PLATFORMS
DEPENDENCIES
afmotion
bubble-wrap
cocoapods (= 0.37.2)
ib
kyan_jukebox!
motion-cocoapods
motion-sparkle
rake
sugarcube

BUNDLED WITH
1.10.6
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Motion::Project::App.setup do |app|
app.codesign_for_release = false

app.info_plist['NSUIElement'] = 1
app.info_plist['NSHumanReadableCopyright'] = 'Copyright © 2013, Kyan Ltd'
app.info_plist['NSHumanReadableCopyright'] = 'Copyright © 2016, Kyan Ltd'

app.pods do
pod 'SocketRocket'
Expand All @@ -27,7 +27,7 @@ Motion::Project::App.setup do |app|
app.sparkle do
release :base_url, 'https://raw.github.com/kyan/kyan_bar/master'
release :package_base_url, 'https://github.com/kyan/kyan_bar/releases/download'
release :version, '1.5.1'
release :version, '1.6'

# Optional settings
release :feed_filename, 'releases.xml'
Expand Down
4 changes: 2 additions & 2 deletions release_notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

Updates:

* Update rendering for El Capitan
* Update the links to various services
* Update UI for El Capitan
* Update services menu
10 changes: 5 additions & 5 deletions releases.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
en
</language>
<pubDate>
Thu, 09 Jul 2015 13:44:14 +0100
Thu, 24 Dec 2015 10:09:10 +0000
</pubDate>
<atom:link href='https://raw.github.com/kyan/kyan_bar/master/releases.xml' rel='self' type='application/rss+xml'/>
<item>
<title>
KyanBar 1.5.1
KyanBar 1.6
</title>
<pubDate>
Thu, 09 Jul 2015 13:44:14 +0100
Thu, 24 Dec 2015 10:09:10 +0000
</pubDate>
<guid isPermaLink='false'>
KyanBar-1.5.1
KyanBar-1.6
</guid>
<sparkle:releaseNotesLink>
https://raw.github.com/kyan/kyan_bar/master/release_notes.html
</sparkle:releaseNotesLink>
<enclosure url='https://github.com/kyan/kyan_bar/releases/download/1.5.1/KyanBar.zip' length='2884545' type='application/octet-stream' sparkle:version='1.5.1' sparkle:dsaSignature='MCwCFFp3a1uMI4PgckxwUpBsE5bzd/smAhQhV3tVvhLvGbAhw1dJVa/Rhy7aMA=='/>
<enclosure url='https://github.com/kyan/kyan_bar/releases/download/1.6/KyanBar.zip' length='3252018' type='application/octet-stream' sparkle:version='1.6' sparkle:dsaSignature='MC0CFFiJqyGmtLTTV4rRHg5IbWkxhFU0AhUAqK3JFKiPJBWg5ewKxVgn6Lg7JN8='/>
</item>
</channel>
</rss>

0 comments on commit 0e1469b

Please sign in to comment.