Skip to content

Commit a42304a

Browse files
bbriattebbriatte
committed
Merge branch 'release/1.0.2'
2 parents 672417e + 2c05b41 commit a42304a

19 files changed

Lines changed: 121 additions & 65 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode8.3
1+
osx_image: xcode9
22
language: objective-c
33
cache:
44
- bundler

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# Change Log
22

33
All notable changes to this project will be documented in this file.
4-
`dependency-injector-object-mapper-swift` adheres to [Semantic Versioning](http://semver.org/).
4+
`dependency-injector-object-mapper` adheres to [Semantic Versioning](http://semver.org/).
5+
6+
---
7+
8+
## [1.0.2](https://github.com/Digipolitan/dependency-injector-object-mapper/releases/tag/v1.0.2)
9+
10+
swift 4 support & ObjectMappper 3.0+ & DependencyInjector 2.1
511

612
---
713

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributing to dependency-injector-object-mapper-swift
1+
# Contributing to dependency-injector-object-mapper
22

33
First off, thanks for taking the time to contribute! :tada::+1:
44

@@ -43,19 +43,19 @@ Explain the problem and include additional details to help maintainers reproduce
4343
* **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
4444
* **Explain which behavior you expected to see instead and why.**
4545
* **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem.
46-
* **If you're reporting that dependency-injector-object-mapper-swift crashed**, include a crash report with a stack trace from the operating system. On iOS, the crash report is available in Xcode, on macOS, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist.
46+
* **If you're reporting that dependency-injector-object-mapper crashed**, include a crash report with a stack trace from the operating system. On iOS, the crash report is available in Xcode, on macOS, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist.
4747
* **If the problem is related to performance**, include a CPU profile capture and a screenshot with your report.
4848
* **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
4949

5050
Provide more context by answering these questions:
5151

52-
* **Did the problem start happening recently** (e.g. after updating to a new version of dependency-injector-object-mapper-swift) or was this always a problem?
53-
* If the problem started happening recently, **can you reproduce the problem in an older version of dependency-injector-object-mapper-swift ?** What's the most recent version in which the problem doesn't happen? You can download older versions of dependency-injector-object-mapper-swift from [the releases page](https://github.com/digipolitan/dependency-injector-object-mapper-swift/releases).
52+
* **Did the problem start happening recently** (e.g. after updating to a new version of dependency-injector-object-mapper) or was this always a problem?
53+
* If the problem started happening recently, **can you reproduce the problem in an older version of dependency-injector-object-mapper ?** What's the most recent version in which the problem doesn't happen? You can download older versions of dependency-injector-object-mapper from [the releases page](https://github.com/digipolitan/dependency-injector-object-mapper/releases).
5454
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
5555

5656
Include details about your configuration and environment:
5757

58-
* **Which version of dependency-injector-object-mapper-swift are you using?
58+
* **Which version of dependency-injector-object-mapper are you using?
5959
* **What's the name and version of the macOS or iOS you're using**?
6060

6161
#### Template For Submitting Bug Reports
@@ -80,7 +80,7 @@ Include details about your configuration and environment:
8080

8181
![Screenshots and GIFs which follow reproduction steps to demonstrate the problem](url)
8282

83-
**dependency-injector-object-mapper-swift version:** [Enter dependency-injector-object-mapper-swift version here]
83+
**dependency-injector-object-mapper version:** [Enter dependency-injector-object-mapper version here]
8484
**OS and version:** [Enter macOS / iOS / linux name and version here]
8585

8686
**Installed packages:**
@@ -89,6 +89,6 @@ Include details about your configuration and environment:
8989

9090
**Additional information:**
9191

92-
* Problem started happening recently, didn't happen in an older version of dependency-injector-object-mapper-swift: [Yes/No]
92+
* Problem started happening recently, didn't happen in an older version of dependency-injector-object-mapper: [Yes/No]
9393
* Problem can be reliably reproduced, doesn't happen randomly: [Yes/No]
9494
* Problem happens with all files and projects, not only some files or projects: [Yes/No]

‎Cartfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github 'Digipolitan/DependencyInjector' ~> 2.0
2-
github 'Hearst-DD/ObjectMapper' ~> 2.0
1+
github 'Digipolitan/DependencyInjector' ~> 2.1
2+
github 'Hearst-DD/ObjectMapper' ~> 3.0

‎DependencyInjectorObjectMapper.podspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
Pod::Spec.new do |s|
22
s.name = "DependencyInjectorObjectMapper"
3-
s.version = "1.0.1"
3+
s.version = "1.0.2"
44
s.summary = "Add Mappable support with dependency injection"
5-
s.homepage = "https://github.com/Digipolitan/dependency-injector-object-mapper-swift"
5+
s.homepage = "https://github.com/Digipolitan/dependency-injector-object-mapper"
66
s.authors = "Digipolitan"
7-
s.source = { :git => "https://github.com/Digipolitan/dependency-injector-object-mapper-swift.git", :tag => "v#{s.version}" }
7+
s.source = { :git => "https://github.com/Digipolitan/dependency-injector-object-mapper.git", :tag => "v#{s.version}" }
88
s.license = { :type => "BSD", :file => "LICENSE" }
99
s.source_files = 'Sources/**/*.{swift,h}'
1010
s.ios.deployment_target = '8.0'
1111
s.watchos.deployment_target = '2.0'
1212
s.tvos.deployment_target = '9.0'
1313
s.osx.deployment_target = '10.10'
1414
s.requires_arc = true
15-
s.dependency 'DependencyInjector', '~> 2.0'
16-
s.dependency 'ObjectMapper', '~> 2.0'
15+
s.dependency 'DependencyInjector', '~> 2.1'
16+
s.dependency 'ObjectMapper', '~> 3.0'
1717
end

‎DependencyInjectorObjectMapper.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@
475475
isa = PBXProject;
476476
attributes = {
477477
LastSwiftUpdateCheck = 0810;
478-
LastUpgradeCheck = 0820;
478+
LastUpgradeCheck = 0900;
479479
ORGANIZATIONNAME = Digipolitan;
480480
TargetAttributes = {
481481
A3169DAF1DE05E8300BABAFD = {
@@ -1057,15 +1057,21 @@
10571057
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
10581058
CLANG_CXX_LIBRARY = "libc++";
10591059
CLANG_ENABLE_OBJC_ARC = YES;
1060+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10601061
CLANG_WARN_BOOL_CONVERSION = YES;
1062+
CLANG_WARN_COMMA = YES;
10611063
CLANG_WARN_CONSTANT_CONVERSION = YES;
10621064
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10631065
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
10641066
CLANG_WARN_EMPTY_BODY = YES;
10651067
CLANG_WARN_ENUM_CONVERSION = YES;
10661068
CLANG_WARN_INFINITE_RECURSION = YES;
10671069
CLANG_WARN_INT_CONVERSION = YES;
1070+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1071+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10681072
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1073+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1074+
CLANG_WARN_STRICT_PROTOTYPES = YES;
10691075
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10701076
CLANG_WARN_SUSPICIOUS_MOVES = YES;
10711077
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1095,7 +1101,7 @@
10951101
SDKROOT = iphoneos;
10961102
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
10971103
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1098-
SWIFT_VERSION = 3.0;
1104+
SWIFT_VERSION = 4.0;
10991105
TARGETED_DEVICE_FAMILY = "1,2";
11001106
VERSIONING_SYSTEM = "apple-generic";
11011107
VERSION_INFO_PREFIX = "";
@@ -1110,15 +1116,21 @@
11101116
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
11111117
CLANG_CXX_LIBRARY = "libc++";
11121118
CLANG_ENABLE_OBJC_ARC = YES;
1119+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
11131120
CLANG_WARN_BOOL_CONVERSION = YES;
1121+
CLANG_WARN_COMMA = YES;
11141122
CLANG_WARN_CONSTANT_CONVERSION = YES;
11151123
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
11161124
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
11171125
CLANG_WARN_EMPTY_BODY = YES;
11181126
CLANG_WARN_ENUM_CONVERSION = YES;
11191127
CLANG_WARN_INFINITE_RECURSION = YES;
11201128
CLANG_WARN_INT_CONVERSION = YES;
1129+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1130+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11211131
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1132+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1133+
CLANG_WARN_STRICT_PROTOTYPES = YES;
11221134
CLANG_WARN_SUSPICIOUS_MOVE = YES;
11231135
CLANG_WARN_SUSPICIOUS_MOVES = YES;
11241136
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1140,7 +1152,7 @@
11401152
MTL_ENABLE_DEBUG_INFO = NO;
11411153
SDKROOT = iphoneos;
11421154
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1143-
SWIFT_VERSION = 3.0;
1155+
SWIFT_VERSION = 4.0;
11441156
TARGETED_DEVICE_FAMILY = "1,2";
11451157
VALIDATE_PRODUCT = YES;
11461158
VERSIONING_SYSTEM = "apple-generic";
@@ -1166,7 +1178,6 @@
11661178
PRODUCT_NAME = DependencyInjectorObjectMapper;
11671179
SKIP_INSTALL = YES;
11681180
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1169-
SWIFT_VERSION = 3.0;
11701181
};
11711182
name = Debug;
11721183
};
@@ -1187,15 +1198,13 @@
11871198
PRODUCT_BUNDLE_IDENTIFIER = com.digipolitan.dependencyinjector.objectmapper;
11881199
PRODUCT_NAME = DependencyInjectorObjectMapper;
11891200
SKIP_INSTALL = YES;
1190-
SWIFT_VERSION = 3.0;
11911201
};
11921202
name = Release;
11931203
};
11941204
A3169DC81DE05E8300BABAFD /* Debug */ = {
11951205
isa = XCBuildConfiguration;
11961206
baseConfigurationReference = 3781EF40D354030A6E0F2336 /* Pods-Tests-DependencyInjectorObjectMapperTests-iOS.debug.xcconfig */;
11971207
buildSettings = {
1198-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11991208
CURRENT_PROJECT_VERSION = 1;
12001209
DEVELOPMENT_TEAM = 582762VK3P;
12011210
INFOPLIST_FILE = Tests/Info.plist;
@@ -1209,7 +1218,6 @@
12091218
isa = XCBuildConfiguration;
12101219
baseConfigurationReference = DD9608F15704DFB1C62767D1 /* Pods-Tests-DependencyInjectorObjectMapperTests-iOS.release.xcconfig */;
12111220
buildSettings = {
1212-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12131221
CURRENT_PROJECT_VERSION = 1;
12141222
DEVELOPMENT_TEAM = 582762VK3P;
12151223
INFOPLIST_FILE = Tests/Info.plist;
@@ -1238,7 +1246,6 @@
12381246
SDKROOT = watchos;
12391247
SKIP_INSTALL = YES;
12401248
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1241-
SWIFT_VERSION = 3.0;
12421249
TARGETED_DEVICE_FAMILY = 4;
12431250
WATCHOS_DEPLOYMENT_TARGET = 2.0;
12441251
};
@@ -1262,7 +1269,6 @@
12621269
PRODUCT_NAME = DependencyInjectorObjectMapper;
12631270
SDKROOT = watchos;
12641271
SKIP_INSTALL = YES;
1265-
SWIFT_VERSION = 3.0;
12661272
TARGETED_DEVICE_FAMILY = 4;
12671273
WATCHOS_DEPLOYMENT_TARGET = 2.0;
12681274
};
@@ -1286,7 +1292,6 @@
12861292
SDKROOT = appletvos;
12871293
SKIP_INSTALL = YES;
12881294
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1289-
SWIFT_VERSION = 3.0;
12901295
TARGETED_DEVICE_FAMILY = 3;
12911296
TVOS_DEPLOYMENT_TARGET = 9.0;
12921297
};
@@ -1309,7 +1314,6 @@
13091314
PRODUCT_NAME = DependencyInjectorObjectMapper;
13101315
SDKROOT = appletvos;
13111316
SKIP_INSTALL = YES;
1312-
SWIFT_VERSION = 3.0;
13131317
TARGETED_DEVICE_FAMILY = 3;
13141318
TVOS_DEPLOYMENT_TARGET = 9.0;
13151319
};
@@ -1319,7 +1323,6 @@
13191323
isa = XCBuildConfiguration;
13201324
baseConfigurationReference = 98C3B8F6A46232CBE82D7AB9 /* Pods-Tests-DependencyInjectorObjectMapperTests-tvOS.debug.xcconfig */;
13211325
buildSettings = {
1322-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13231326
CURRENT_PROJECT_VERSION = 1;
13241327
DEVELOPMENT_TEAM = 582762VK3P;
13251328
INFOPLIST_FILE = Tests/Info.plist;
@@ -1335,7 +1338,6 @@
13351338
isa = XCBuildConfiguration;
13361339
baseConfigurationReference = FFFFB4E5C4127E4A95CF710E /* Pods-Tests-DependencyInjectorObjectMapperTests-tvOS.release.xcconfig */;
13371340
buildSettings = {
1338-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13391341
CURRENT_PROJECT_VERSION = 1;
13401342
DEVELOPMENT_TEAM = 582762VK3P;
13411343
INFOPLIST_FILE = Tests/Info.plist;
@@ -1368,7 +1370,6 @@
13681370
SDKROOT = macosx;
13691371
SKIP_INSTALL = YES;
13701372
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1371-
SWIFT_VERSION = 3.0;
13721373
};
13731374
name = Debug;
13741375
};
@@ -1392,15 +1393,13 @@
13921393
PRODUCT_NAME = DependencyInjectorObjectMapper;
13931394
SDKROOT = macosx;
13941395
SKIP_INSTALL = YES;
1395-
SWIFT_VERSION = 3.0;
13961396
};
13971397
name = Release;
13981398
};
13991399
A3169E211DE072C800BABAFD /* Debug */ = {
14001400
isa = XCBuildConfiguration;
14011401
baseConfigurationReference = A93CCF480FC175F07743D64A /* Pods-Tests-DependencyInjectorObjectMapperTests-OSX.debug.xcconfig */;
14021402
buildSettings = {
1403-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
14041403
COMBINE_HIDPI_IMAGES = YES;
14051404
CURRENT_PROJECT_VERSION = 1;
14061405
DEVELOPMENT_TEAM = 582762VK3P;
@@ -1417,7 +1416,6 @@
14171416
isa = XCBuildConfiguration;
14181417
baseConfigurationReference = CA019E8C38EC9FB3647284BD /* Pods-Tests-DependencyInjectorObjectMapperTests-OSX.release.xcconfig */;
14191418
buildSettings = {
1420-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
14211419
COMBINE_HIDPI_IMAGES = YES;
14221420
CURRENT_PROJECT_VERSION = 1;
14231421
DEVELOPMENT_TEAM = 582762VK3P;

‎DependencyInjectorObjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-OSX.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎DependencyInjectorObjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-tvOS.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎DependencyInjectorObjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-watchOS.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)