Skip to content

Commit

Permalink
Merge pull request #48 from JanGorman/reboot
Browse files Browse the repository at this point in the history
Reboot
  • Loading branch information
JanGorman authored Oct 31, 2017
2 parents 13abc19 + a568df5 commit 38b5f70
Show file tree
Hide file tree
Showing 124 changed files with 4,324 additions and 3,803 deletions.
51 changes: 13 additions & 38 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,39 +1,14 @@
### https://raw.github.com/github/gitignore/95d8ff4e7aedb5a1742fe1f70ea8f33f267adf42/Global/JetBrains.gitignore
### https://raw.github.com/github/gitignore//Global/Xcode.gitignore

# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm

## Directory-based project format
.idea/
# if you remove the above rule, at least ignore user-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# and these sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml

## File-based project format
*.ipr
*.iws
*.iml

## Additional for IntelliJ
out/

# generated by mpeltonen/sbt-idea plugin
.idea_modules/

# generated by JIRA plugin
atlassian-ide-plugin.xml

# generated by Crashlytics plugin (for Android Studio and Intellij)
com_crashlytics_export_strings.xml


### https://raw.github.com/github/gitignore/95d8ff4e7aedb5a1742fe1f70ea8f33f267adf42/Global/Xcode.gitignore
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -42,10 +17,10 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
xcuserdata/

## Other
*.moved-aside
DerivedData
*.xcuserstate
*.xccheckout
*.xcscmblueprint

Carthage/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "MapleBacon/Frameworks/Hippolyte"]
path = Frameworks/Hippolyte
url = https://github.com/JanGorman/Hippolyte.git
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
language: objective-c
osx_image: xcode9
script:
- git submodule init
- bundle exec fastlane scan --code_coverage true --project MapleBacon.xcodeproj --scheme MapleBacon
after_success:
- bash <(curl -s https://codecov.io/bash)
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changelog

### 5.0.0

- Rewrite of MapleBacon
- Improved and faster cache handling
- Support for custom image transformations
- UIButton support
Loading

0 comments on commit 38b5f70

Please sign in to comment.