Skip to content

Commit 63269dc

Browse files
jdewindjdewind
committed
Merge branch 'release/1.6.1'
2 parents 66e6cd4 + 0a8f6ef commit 63269dc

18 files changed

+54
-36
lines changed

‎.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
language: objective-c
22
script: rake specs:all
3-
3+
osx_image: xcode6.4
4+
install:
5+
- bundle install

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,11 @@ Nothing in this version has changed that would cause those that are upgrading fr
1818
**[Changes](#changes)**
1919

2020
1. Ad-Hoc initializers can be used via the JSObjectionInjector and JSObjectFactory
21+
22+
# 1.6.1
23+
24+
**[Changes](#changes)**
25+
26+
1. Fixed build issues in XCode 6.4 and updated Nimble & Quick testing libraries
27+
2. Improved test output via xcpretty
28+
3. Fixed regression raised in issue #94 (https://github.com/atomicobject/objection/issues/94)

‎Gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "http://rubygems.org"
2+
gem "xcpretty"

‎Gemfile.lock

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
GEM
2+
remote: http://rubygems.org/
3+
specs:
4+
xcpretty (0.1.10)
5+
6+
PLATFORMS
7+
ruby
8+
9+
DEPENDENCIES
10+
xcpretty

‎Objection-Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.6</string>
16+
<string>1.6.1</string>
1717
<key>CFBundleSignature</key>
1818
<string>ATOM</string>
1919
<key>CFBundleVersion</key>
20-
<string>1.6</string>
20+
<string>1.6.1</string>
2121
</dict>
2222
</plist>

‎Objection.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Objection'
3-
s.version = '1.6'
3+
s.version = '1.6.1'
44
s.summary = 'A lightweight dependency injection framework for Objective-C.'
55
s.author = { 'Justin DeWind' => '[email protected]' }
66
s.source = { :git => 'https://github.com/atomicobject/objection.git', :tag => "#{s.version}" }

‎Objection.xcodeproj/project.pbxproj

+3-15
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@
699699
0867D690FE84028FC02AAC07 /* Project object */ = {
700700
isa = PBXProject;
701701
attributes = {
702-
LastUpgradeCheck = 0610;
702+
LastUpgradeCheck = 0640;
703703
};
704704
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Objection" */;
705705
compatibilityVersion = "Xcode 3.2";
@@ -1016,10 +1016,6 @@
10161016
isa = XCBuildConfiguration;
10171017
buildSettings = {
10181018
ALWAYS_SEARCH_USER_PATHS = NO;
1019-
ARCHS = (
1020-
"$(ARCHS_STANDARD)",
1021-
armv7s,
1022-
);
10231019
CLANG_ENABLE_OBJC_ARC = YES;
10241020
COPY_PHASE_STRIP = NO;
10251021
DSTROOT = /tmp/Objection.dst;
@@ -1045,10 +1041,6 @@
10451041
isa = XCBuildConfiguration;
10461042
buildSettings = {
10471043
ALWAYS_SEARCH_USER_PATHS = NO;
1048-
ARCHS = (
1049-
"$(ARCHS_STANDARD)",
1050-
armv7s,
1051-
);
10521044
CLANG_ENABLE_OBJC_ARC = YES;
10531045
DSTROOT = /tmp/Objection.dst;
10541046
FRAMEWORK_SEARCH_PATHS = (
@@ -1079,6 +1071,7 @@
10791071
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10801072
ENABLE_STRICT_OBJC_MSGSEND = YES;
10811073
GCC_C_LANGUAGE_STANDARD = c99;
1074+
GCC_NO_COMMON_BLOCKS = YES;
10821075
GCC_OPTIMIZATION_LEVEL = 0;
10831076
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
10841077
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1105,6 +1098,7 @@
11051098
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
11061099
ENABLE_STRICT_OBJC_MSGSEND = YES;
11071100
GCC_C_LANGUAGE_STANDARD = c99;
1101+
GCC_NO_COMMON_BLOCKS = YES;
11081102
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
11091103
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
11101104
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1120,7 +1114,6 @@
11201114
4B25BE4B1291C43400821DC1 /* Debug */ = {
11211115
isa = XCBuildConfiguration;
11221116
buildSettings = {
1123-
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
11241117
COPY_PHASE_STRIP = NO;
11251118
GCC_DYNAMIC_NO_PIC = NO;
11261119
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1134,7 +1127,6 @@
11341127
4B25BE4C1291C43400821DC1 /* Release */ = {
11351128
isa = XCBuildConfiguration;
11361129
buildSettings = {
1137-
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
11381130
COPY_PHASE_STRIP = YES;
11391131
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11401132
GCC_C_LANGUAGE_STANDARD = c99;
@@ -1151,7 +1143,6 @@
11511143
isa = XCBuildConfiguration;
11521144
buildSettings = {
11531145
ALWAYS_SEARCH_USER_PATHS = NO;
1154-
ARCHS = "$(ARCHS_STANDARD)";
11551146
CLANG_ENABLE_MODULES = YES;
11561147
CLANG_ENABLE_OBJC_ARC = YES;
11571148
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
@@ -1195,7 +1186,6 @@
11951186
isa = XCBuildConfiguration;
11961187
buildSettings = {
11971188
ALWAYS_SEARCH_USER_PATHS = NO;
1198-
ARCHS = "$(ARCHS_STANDARD)";
11991189
CLANG_ENABLE_MODULES = YES;
12001190
CLANG_ENABLE_OBJC_ARC = YES;
12011191
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
@@ -1235,7 +1225,6 @@
12351225
isa = XCBuildConfiguration;
12361226
buildSettings = {
12371227
ALWAYS_SEARCH_USER_PATHS = NO;
1238-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
12391228
CLANG_ENABLE_MODULES = YES;
12401229
CLANG_ENABLE_OBJC_ARC = YES;
12411230
COMBINE_HIDPI_IMAGES = YES;
@@ -1274,7 +1263,6 @@
12741263
isa = XCBuildConfiguration;
12751264
buildSettings = {
12761265
ALWAYS_SEARCH_USER_PATHS = NO;
1277-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
12781266
CLANG_ENABLE_MODULES = YES;
12791267
CLANG_ENABLE_OBJC_ARC = YES;
12801268
COMBINE_HIDPI_IMAGES = YES;

‎Objection.xcodeproj/xcshareddata/xcschemes/Objection-StaticLib.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Objection.xcodeproj/xcshareddata/xcschemes/Objection-iOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Objection.xcodeproj/xcshareddata/xcschemes/Objection.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Objection.xcodeproj/xcshareddata/xcschemes/Specs-OSX.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Objection.xcodeproj/xcshareddata/xcschemes/Specs-iOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,9 @@ objection_initializer(truckWithMake:model:)
358358
@end
359359

360360
- (void)buildCar {
361-
ConfigurableCar *car = [self.objectFactory getObject:[ConfigurableCar class], initializer: @selector(initWithModel:) withArgumentList:@[@"VW", @"Passat"]];
361+
ConfigurableCar *car = [self.objectFactory getObject:[ConfigurableCar class],
362+
initializer: @selector(initWithModel:)
363+
withArgumentList:@[@"Passat"]];
362364
}
363365
```
364366
@@ -406,7 +408,7 @@ It can be downloaded [here](http://objection-framework.org/files/Objection-1.5.t
406408
Edit your Pofile
407409
408410
edit Podfile
409-
pod 'Objection', '1.6'
411+
pod 'Objection', '1.6.1'
410412
411413
Now you can install Objection
412414

‎Rakefile

+11-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ end
3030
namespace :artifact do
3131
desc "Build OSX Framework"
3232
task :osx => :clean do
33-
system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target Objection -configuration Release build], nil)
33+
system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target Objection -configuration Release build | xcpretty -c], nil)
3434
end
3535

3636
desc "Build iOS Framework"
3737
task :ios => :clean do
38-
system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target Objection-iOS -configuration Release build] , nil)
38+
system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -target Objection-iOS -configuration Release build | xcpretty -c] , nil)
3939
end
4040

4141
require 'rake/clean'
@@ -56,28 +56,33 @@ end
5656

5757
task :clean do
5858
stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "clean.output") if (ENV['IS_CI_BOX'])
59-
system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} clean], stdout)
59+
system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} clean | xcpretty -c], stdout)
6060
end
6161

6262
task :build_all do
6363
stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "build_all.output") if (ENV['IS_CI_BOX'])
64-
system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} build], stdout)
64+
system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -alltargets -configuration #{CONFIGURATION} build | xcpretty -c], stdout)
6565
end
6666

67+
task :publish do
68+
system_or_exit %Q[pod trunk publish Objection.podspec --allow-warnings]
69+
end
70+
71+
6772
namespace :specs do
6873
desc "All Specs"
6974
task :all => [:osx, :ios]
7075

7176
desc "OS X Specs"
7277
task :osx do
7378
stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "build_specs.output") if (ENV['IS_CI_BOX'])
74-
system_or_exit(%Q[#{xcodebuild_executable} test -project #{PROJECT_NAME}.xcodeproj -scheme #{SPECS_TARGET_NAME} -configuration #{CONFIGURATION}], stdout)
79+
system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} test -project #{PROJECT_NAME}.xcodeproj -scheme #{SPECS_TARGET_NAME} -configuration #{CONFIGURATION} | xcpretty -c], stdout)
7580
end
7681

7782
desc "iOS Specs"
7883
task :ios do
7984
stdout = File.join(ENV['CC_BUILD_ARTIFACTS'], "build_uispecs.output") if (ENV['IS_CI_BOX'])
8085
ENV["TEST_AFTER_BUILD"] = "Yes"
81-
system_or_exit(%Q[#{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -scheme #{UI_SPECS_TARGET_NAME} -sdk iphonesimulator -configuration #{CONFIGURATION} -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' test ], stdout)
86+
system_or_exit(%Q[set -o pipefail; #{xcodebuild_executable} -project #{PROJECT_NAME}.xcodeproj -scheme #{UI_SPECS_TARGET_NAME} -sdk iphonesimulator -configuration #{CONFIGURATION} -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' test | xcpretty -c], stdout)
8287
end
8388
end

‎Source/JSObjectionProviderEntry.m

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ @interface JSObjectionProviderEntry () {
1010
@end
1111

1212
@implementation JSObjectionProviderEntry
13+
@synthesize lifeCycle = _lifeCycle;
1314

1415
- (id)initWithProvider:(id<JSObjectionProvider>)theProvider lifeCycle:(JSObjectionScope)theLifeCycle {
1516
if ((self = [super init])) {

‎Specs/BasicUsageSpecs.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
[[JSObjection defaultInjector] injectDependencies:car];
6161

6262
assertThatBool([car awake], isTrue());
63-
assertThatBool([car.engine awake], isFalse());
63+
assertThatBool([car.engine awake], isTrue());
6464
});
6565

6666
it(@"defaults to returning a new instance", ^{
@@ -112,7 +112,7 @@
112112
id car = [[JSObjection defaultInjector] getObject:[Car class]];
113113

114114
assertThatBool([engine awake], isTrue());
115-
assertThatBool([car awake], isFalse());
115+
assertThatBool([car awake], isTrue());
116116
});
117117

118118

‎Vendor/Nimble

Submodule Nimble updated 65 files

‎Vendor/Quick

Submodule Quick updated 29 files

0 commit comments

Comments
 (0)