Skip to content

Commit

Permalink
Merge pull request #25 from Onix-Systems/release/0.2.0
Browse files Browse the repository at this point in the history
Release 0.2.0 to master
  • Loading branch information
Anton Dolzhenko authored Jan 4, 2017
2 parents b572d44 + f876b73 commit 41845ea
Show file tree
Hide file tree
Showing 148 changed files with 3,172 additions and 2,120 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.DS_Store
project.xcworkspace
xcuserdata
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0
81 changes: 81 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# Contributing - How we add to the product

## General

* Each message (issue, commit, pull request) starts with a verb
* Each message starts with an uppercase and doesn't end with a period
* Each message starts with a line that is less than 80 characters long

**Examples:**

* _Design login workflow_
* _Update to latest version of Play tools_
* _Improve display of CI failures_


## Issues

* Each issue represents a single problem
* Each issue has a milestone attached

## Milestones

* Each milestone needs to match one of the following patterns:
* semantic version number (`1.0`, `1.0.5`)
* semantic version number with a wildcard (`2.x`, `2.1.x`)
* `undecided` - issues we want to keep, but aren't sure when we'll address
* `invalid` - issues that were duplicate, invalid (or similar) go here to avoid upsetting milestone counts

# Versioning

## Commits

* Each commit represents a single change
* Each commit keeps the project fully functional
* Each commit message that closes an issue ends with `(close #XYZ)`

**Examples:**

* _Design login workflow (close #1)_
* _Fix typo in about dialog_
* _Document data model accessors (close #3, close #4)_

## Pull requests

* Each pull request represents a single problem
* Each pull request has a milestone attached
* Each pull request contains as few commits as needed
* Each pull request is rebased on latest `develop`
* Each pull request is free from fixup or revert commits

## Branches

* Use _true merge_ if it's desirable for the branch to remain visible in the long run
* Use _fast-forward merge_ for temporary branches

# Workflow

## Development

1. Create a feature branch `feature/xxx-yyy-zzz`
2. Make and commit changes
3. Create a pull request against `develop`
4. Go through code review
5. See your pull request merged

## Deployment

1. Branch out `release/X.Y.Z` from `develop`
2. Test the release
3. Merge the release branch to `master`
4. Tag the merge commit as `vX.Y.Z`
5. Delete the release branch
6. Deploy from `master` branch

# Code

## General

1. No magic numbers in storyboards. To have space between views - use layout margins. To get even more space - use embed views.
1. Extention vs subclassing. Avoid subclassing and use protocols instead. One can [google](https://www.google.com.ua/search?client=safari&rls=en&q=swift+protocol+vs+subclass&ie=UTF-8&oe=UTF-8&gfe_rd=cr&ei=SjkHWKOKD5Gr8wfRv6OoDQ) about it or check [this](http://mikebuss.com/2016/01/10/interfaces-vs-inheritance/) artcile or [this](http://krakendev.io/blog/subclassing-can-suck-and-heres-why) or even [this](https://www.natashatherobot.com/swift-2-0-protocol-oriented-mvvm/).
1. Use `NSLocalizedString` for all strings visible to user.
8 changes: 8 additions & 0 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
platform :ios, '10.0'
use_frameworks!

target 'RainyRefreshControl Demo' do

pod 'RainyRefreshControl', :git => 'https://github.com/Onix-Systems/RainyRefreshControl', :branch => 'feature/remove-sample-project'

end
25 changes: 25 additions & 0 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
PODS:
- pop (1.0.9)
- RainyRefreshControl (0.2.0):
- pop (= 1.0.9)

DEPENDENCIES:
- RainyRefreshControl (from `https://github.com/Onix-Systems/RainyRefreshControl`, branch `feature/remove-sample-project`)

EXTERNAL SOURCES:
RainyRefreshControl:
:branch: feature/remove-sample-project
:git: https://github.com/Onix-Systems/RainyRefreshControl

CHECKOUT OPTIONS:
RainyRefreshControl:
:commit: 3d411c66108c9022a173f3b7275d94cd0668a8ea
:git: https://github.com/Onix-Systems/RainyRefreshControl

SPEC CHECKSUMS:
pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce
RainyRefreshControl: e4718413438a92edfce3e90b74cba0e5fccfd88a

PODFILE CHECKSUM: 19b644a50858bac13f7f1af5ee9d9728d76ac170

COCOAPODS: 1.2.0.beta.3
38 changes: 38 additions & 0 deletions Example/Pods/Local Podspecs/RainyRefreshControl.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 41845ea

Please sign in to comment.