Skip to content

Commit

Permalink
Merge branch 'release/1.4' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jdewind committed Mar 29, 2014
2 parents 014dd6a + 2877675 commit 230dd58
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# 1.4

**[Breaking changes](#breaking-changes)**
Nothing in this version has changed that would cause those that are upgrading from 1.3.1 any problems

**[Changes](#changes)**

1. Providers can be defined as a singletons, which means that Objection will save the first value generated by the provider.
2. Fixed an issue where an object that is registered as a singleton in a module could not be an _eager singleton_
6 changes: 3 additions & 3 deletions Objection-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.atomicobject.${PRODUCT_NAME:rfc1.3.14identifier}</string>
<string>com.atomicobject.${PRODUCT_NAME:rfc1.44identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.3.1</string>
<string>1.4</string>
<key>CFBundleSignature</key>
<string>ATOM</string>
<key>CFBundleVersion</key>
<string>1.3.1</string>
<string>1.4</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Objection.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Objection'
s.version = '1.3.1'
s.version = '1.4'
s.summary = 'A lightweight dependency injection framework for Objective-C.'
s.author = { 'Justin DeWind' => '[email protected]' }
s.source = { :git => 'https://github.com/atomicobject/objection.git', :tag => "#{s.version}" }
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,12 @@ If you're using [Kiwi](https://github.com/allending/Kiwi) for testing, checkout

### Static Framework and Linkable Framework

It can be downloaded [here](http://objection-framework.org/files/Objection-1.3.1.tar.gz)
It can be downloaded [here](http://objection-framework.org/files/Objection-1.4.tar.gz)

### Building Static Framework

git clone git://github.com/atomicobject/objection.git
git checkout 1.3.1
git checkout 1.4

#### iOS

Expand All @@ -362,7 +362,7 @@ It can be downloaded [here](http://objection-framework.org/files/Objection-1.3.1
Edit your Pofile

edit Podfile
pod 'Objection', '1.3.1'
pod 'Objection', '1.4'

Now you can install Objection

Expand Down

0 comments on commit 230dd58

Please sign in to comment.