Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
euskadi31 committed Feb 12, 2016
2 parents 861a7a0 + f9a9d7d commit b3e7cd4
Show file tree
Hide file tree
Showing 19 changed files with 951 additions and 30 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ DerivedData/
*.perspectivev3
!default.perspectivev3
xcuserdata/
xcshareddata/
*.xcodeproj/project.xcworkspace/xcshareddata/*


## Other
*.moved-aside
Expand Down Expand Up @@ -53,3 +54,6 @@ fastlane/report.xml
fastlane/screenshots
*.gcda
*.gcno
*.cer
*.p12
!apple.cer
45 changes: 36 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,43 @@
language: objective-c
osx_image: xcode7.2
before_install:
- rvm use $RVM_RUBY_VERSION
# - brew update
- rvm use $RVM_RUBY_VERSION
- brew update
install:
# - brew outdated xctool || brew upgrade xctool
- bundle install --without=documentation --jobs=3 --retry=3
- brew outdated xctool || brew upgrade xctool
- bundle install --without=documentation --jobs=3 --retry=3
before_script:
- openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in scripts/certs/dist.cer.enc -d -a -out scripts/certs/dist.cer
- openssl aes-256-cbc -k "$ENCRYPTION_SECRET" -in scripts/certs/dist.p12.enc -d -a -out scripts/certs/dist.p12
- security create-keychain -p travis ios-build.keychain
- security default-keychain -s ios-build.keychain
- security unlock-keychain -p travis ios-build.keychain
- security set-keychain-settings -t 3600 -l ~/Library/Keychains/ios-build.keychain
- security import ./scripts/certs/apple.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
- security import ./scripts/certs/dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
- security import ./scripts/certs/dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $KEY_PASSWORD -T /usr/bin/codesign
script:
- xctool -project Glide.xcodeproj -scheme Glide build test -sdk macosx10.11 GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES
- open -b com.apple.iphonesimulator # Workaround https://github.com/travis-ci/travis-ci/issues/3040
- xctool -project Glide.xcodeproj -scheme $SCHEME build test -destination='$DESTINATION' GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES OBJROOT=$PWD/build SYMROOT=$PWD/build
after_success:
- slather setup Glide.xcodeproj
- slather coverage --coveralls --input-format profdata --source-directory Glide/ --scheme Glide Glide.xcodeproj
- '[ "$CONFIGURATION" == "Debug" ] && slather coverage --coveralls --input-format profdata --scheme Glide Glide.xcodeproj'
after_script:
- security delete-keychain ios-build.keychain
- rm -rf scripts/certs/dist.p12
- rm -rf scripts/certs/dist.cer
cache:
directories:
- vendor/bundle
directories:
- vendor/bundle
env:
matrix:
- 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.0" CONFIGURATION="Release" SCHEME="GlideIOS"'
- 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.2" CONFIGURATION="Release" SCHEME="GlideIOS"'
- 'DESTINATION="platform=iOS Simulator,name=iPhone 6s,OS=9.2" CONFIGURATION="Release" SCHEME="GlideIOS"'
- 'DESTINATION="platform=iOS Simulator,name=iPhone 4s" CONFIGURATION="Release" SCHEME="GlideIOS"'
- 'DESTINATION="platform=iOS Simulator,name=iPhone 5s" CONFIGURATION="Release" SCHEME="GlideIOS"'
- 'DESTINATION="platform=OS X" CONFIGURATION="Release" SCHEME="Glide"'
- 'DESTINATION="platform=OS X" CONFIGURATION="Debug" SCHEME="Glide"'
- 'DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p" CONFIGURATION="Release" SCHEME="GlideTvOS"'
global:
- secure: aIjFYHUnBYysw7HAwqjIRT0Mu4vkYEqe4fbHiWDOCQih7UYjE+yq4WcMgWY6huComUUyNRNhH9a5rg5ww8llY6Zeyf/7l9SE7rKddK8adv3pGrc3Idpzb6w4ifxye+Jt0jWwqwZrA24JnB/xNhsd79430mMqlMgyGZTz+ArMz8W8B0KKqywUM/jsF/dlZLeD1jFX5Tn5Y/rSsDDhzs210WE9VXvqBYEFHaGlGTR17HPfGa05CWoivvTfGymAa5v+W2pPKlJBuL8UIRGwD83ILdBGXhHlolPLBSFV2W5GcBLpyZdFmOgoD/7nFCHdpoJXz9GL3XmTaKsMotvLMzRLmx/QriqyGrW7eu4g3p3hE/QsA3Wtgfz7gkbP2+B78HaArJ45lxaRn3foI30AkxV9d8nhuzocygmz8XWJH9cMk2/6LylhIm7yQxYad7vZHHzoIav9gI4Fwg17ONFsCAzCDl/QznqJofcGaA+G1MdecNMKvaYgSSwsaaRIq/FgNP+N9w0MDLTwq5sJQfv4dJH09tSbj+k4dRFTVF+w9q4erOx7M9VXQBMkjA5NZmkhujf+GJPzjx5Nefuenq5lCt2K3wZN8Da0lDAXQdBIjwWkFCZnFye8SoeSqnvL6wRvkyeXqkYk5yQ5u+NijkZ21XnsuEV5Kov/b2jWsJqw2bylCcw=
- secure: n005EBUewdfHH5YK/Q8RsGzVS6Ybw8oMtypdkAi6sztRd28lSKUQz5K5EiFEKOX4immxhfw8XRHRPzLj69aXIunxWZ/cPPT/nYnUObCIi7YoN87KbLqh3IoCEMqD04Qn6kj2LBG6KlSax1MG6tcj9ZImfUCdRDq4Aoy1lDq/GBF26Y1ilhirdOYxAI7XORolwig7QWqiKdqVqq5PyaEtC8AHo2OM3uyfFqosr0FcXyjKtDQDX+X6reScehJ8eK15ztwL3a8WmUELodbRKxbDZcpONMS7GEzGWWOCiM8e8TfSvZX8XlPlo2TnkT/Du9s3EoJNvzN3b8z81iqQYGgoYHWsJPJjjbXLFCpb5X9h3G1H3lumNr975lNJNSBS2sTVteFfZkzg+iYOhuhOhr/f7/Xjh6gKk9JJzMw9ZVqf8GygV5w9NCbJK5hkTlM5SSKjkt2vEfZM4zdojwGZW5vVHz9JW8vuU089BJHxTjp8yzEsG2oyDixmbno55+uBkdVlDhb8sB6Ig/G4DzMvt8ZAbqyKIr37lOVZz6Ppd1hcjTt63s1UcHzLANK/2HBRFGh6UtHT5DlE5s1iJoMX3WzFXwtqAsbnh8vYLANrbFSS9J4Sdf+m66by3wX8jU86PPL3ga6bFAbjb/oZtSj4vll/KMg4wLLWTV0MsToQgaVa0Ko=
2 changes: 1 addition & 1 deletion Glide.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Glide'
s.version = '1.0.1'
s.version = '1.0.2'
s.summary = 'Glide client for iOS & Mac OS X'
s.author = {
'Axel Etcheverry' => 'axel@etcheverry.biz'
Expand Down
22 changes: 22 additions & 0 deletions Glide.podspec.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Pod::Spec.new do |s|
s.name = 'Glide'
s.version = '@VERSION@'
s.summary = 'Glide client for iOS & Mac OS X'
s.author = {
'Axel Etcheverry' => 'axel@etcheverry.biz'
}
s.source = {
:git => 'https://github.com/euskadi31/glide-objc.git',
:tag => "v#{s.version}"
}
s.source_files = 'Glide/**/*.{h}'
s.homepage = 'https://github.com/euskadi31/glide-objc'
s.license = {
:type => 'MIT',
:file => 'LICENSE.md'
}
s.social_media_url = 'http://twitter.com/euskadi31'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.11'
s.tvos.deployment_target = '9.0'
end
Loading

0 comments on commit b3e7cd4

Please sign in to comment.