Ver código fonte

Merge pull request #320 from kishikawakatsumi/kk/302

Bump version to 3.0.2
kishikawa katsumi 8 anos atrás
pai
commit
466f291b12
6 arquivos alterados com 35 adições e 34 exclusões
  1. 0 1
      .ruby-version
  2. 26 24
      .travis.yml
  3. 1 1
      KeychainAccess.podspec
  4. 6 6
      Lib/Gemfile.lock
  5. 1 1
      Lib/KeychainAccess/Info.plist
  6. 1 1
      Lib/Rakefile

+ 0 - 1
.ruby-version

@@ -1 +0,0 @@
-2.3.1

+ 26 - 24
.travis.yml

@@ -2,34 +2,36 @@ language: objective-c
 osx_image: xcode8
 cache:
   directories:
-    - Lib/vendor/bundle
+  - Lib/vendor/bundle
 before_install:
-  - brew update
-  - brew outdated carthage || brew upgrade carthage
+- brew update
+- brew outdated carthage || brew upgrade carthage
 install:
-  - "(cd Lib && bundle install --path=vendor/bundle --binstubs=vendor/bin)"
+- "(cd Lib && bundle install --path=vendor/bundle --binstubs=vendor/bin)"
 before_script:
-  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/ios_developer.p12.enc -d -a -out ./Lib/Certificates/ios_developer.p12 || true
-  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/developer_id_app.p12.enc -d -a -out ./Lib/Certificates/developer_id_app.p12 || true
-  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/iOS_Development.mobileprovision.enc -d -a -out ./Lib/Certificates/iOS_Development.mobileprovision || true
-  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/tvOS_Development.mobileprovision.enc -d -a -out ./Lib/Certificates/tvOS_Development.mobileprovision || true
-  - openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/KeychainAccess_Tests.provisionprofile.enc -d -a -out ./Lib/Certificates/KeychainAccess_Tests.provisionprofile || true
-  - ./Lib/Scripts/add_key.sh || true
+- openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/ios_developer.p12.enc -d -a -out ./Lib/Certificates/ios_developer.p12 || true
+- openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/developer_id_app.p12.enc -d -a -out ./Lib/Certificates/developer_id_app.p12 || true
+- openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/iOS_Development.mobileprovision.enc -d -a -out ./Lib/Certificates/iOS_Development.mobileprovision || true
+- openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/tvOS_Development.mobileprovision.enc -d -a -out ./Lib/Certificates/tvOS_Development.mobileprovision || true
+- openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in ./Lib/Certificates/KeychainAccess_Tests.provisionprofile.enc -d -a -out ./Lib/Certificates/KeychainAccess_Tests.provisionprofile || true
+- ./Lib/Scripts/add_key.sh || true
 script:
-  - "(cd Lib && bundle exec rake $ACTION)"
-branches:
-  only:
-    - master
+- "(cd Lib && bundle exec rake $ACTION)"
+after_success:
+- bash <(curl -s https://codecov.io/bash) -D './build' -J 'KeychainAccess'
 env:
   matrix:
-    - ACTION=build
-    - ACTION='build:carthage'
-    - ACTION='test:iphonesimulator:debug coverage:coveralls'
-    - ACTION='test:iphonesimulator:release coverage:coveralls'
-    - ACTION='test:appletvsimulator coverage:coveralls'
-    - ACTION='test:macosx coverage:coveralls'
+  - ACTION=build
+  - ACTION='build:carthage'
+  - ACTION='test:iphonesimulator:debug'
+  - ACTION='test:iphonesimulator:release'
+  - ACTION='test:appletvsimulator'
+  - ACTION='test:macosx'
   global:
-    - LANG=en_US.UTF-8
-    - LC_ALL=en_US.UTF-8
-    - secure: KL59HA2XSRa215qVXXnFpx48Tb/k+vNfFAbzyc+0M4mXl1VhSJv3bkTslqDrX822t3iFDFYhXbJ6aUo7szSdcbnCXU7VIhNPRK5QM00eS1AI4V0UwDQZ06g2f4Dmt+cQxACg+0CB0OaPnUCA4rkQQKeBMAWa67Tp2hNgQHwsnio=
-    - secure: B8zXiyX1zEq6uWaCxap5iW1joQBoOjNjSUlcs1t+QKdaFCFtjOI8C1JCClzk7rTnGNDDrhahFlE8yskSNKoBsaW2UJ8TzPIkD4F2pkxTHkaFQl/GBsdbHdOUFL4h0/zGQ6wY1Qhw7C+8+3U+1c9QbnNw6jOQwXTF6gs/XTNzG9Y=
+  - LANG=en_US.UTF-8
+  - LC_ALL=en_US.UTF-8
+  - secure: KL59HA2XSRa215qVXXnFpx48Tb/k+vNfFAbzyc+0M4mXl1VhSJv3bkTslqDrX822t3iFDFYhXbJ6aUo7szSdcbnCXU7VIhNPRK5QM00eS1AI4V0UwDQZ06g2f4Dmt+cQxACg+0CB0OaPnUCA4rkQQKeBMAWa67Tp2hNgQHwsnio=
+  - secure: B8zXiyX1zEq6uWaCxap5iW1joQBoOjNjSUlcs1t+QKdaFCFtjOI8C1JCClzk7rTnGNDDrhahFlE8yskSNKoBsaW2UJ8TzPIkD4F2pkxTHkaFQl/GBsdbHdOUFL4h0/zGQ6wY1Qhw7C+8+3U+1c9QbnNw6jOQwXTF6gs/XTNzG9Y=
+branches:
+  only:
+  - master

+ 1 - 1
KeychainAccess.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'KeychainAccess'
-  s.version          = '3.0.1'
+  s.version          = '3.0.2'
   s.summary          = 'KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and OS X.'
   s.description      = <<-DESC
                          KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and OS X.

+ 6 - 6
Lib/Gemfile.lock

@@ -1,11 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (11.2.2)
-    rouge (1.11.1)
-    xcjobs (0.5.1)
-    xcpretty (0.2.2)
-      rouge (~> 1.8)
+    rake (12.0.0)
+    rouge (2.0.7)
+    xcjobs (0.8.1)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
@@ -16,4 +16,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.12.5
+   1.15.0

+ 1 - 1
Lib/KeychainAccess/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.1</string>
+	<string>3.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

+ 1 - 1
Lib/Rakefile

@@ -100,7 +100,7 @@ namespace :test do
         t.add_destination(destination)
       end
       t.configuration = configuration
-      t.coverage = true
+      t.add_build_option('-enableCodeCoverage', 'YES')
       t.build_dir = 'build'
       t.formatter = 'xcpretty -c'
     end