Skip to content

Commit

Permalink
Merge pull request #2 from MindaugasJucius/master
Browse files Browse the repository at this point in the history
Add Swift 4.2 support
  • Loading branch information
Daltron authored Jul 9, 2018
2 parents cbf265d + eb7ab00 commit 4aacb76
Show file tree
Hide file tree
Showing 69 changed files with 1,467 additions and 2,586 deletions.
2 changes: 1 addition & 1 deletion AlamoRecord.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ AlamoRecord is a powerful yet simple framework that eliminates the often complex
s.watchos.deployment_target = '2.0'

s.source_files = 'AlamoRecord/Classes/**/*'
s.dependency 'AlamofireObjectMapper', '~> 5.0'
s.dependency 'AlamofireObjectMapper', '~> 5.1'
end
32 changes: 0 additions & 32 deletions Example/AlamoRecord.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,6 @@
5C6346F81F0B076B00158A80 /* Frameworks */,
5C6346F91F0B076B00158A80 /* Resources */,
D629E9B379E7261E35D17333 /* [CP] Embed Pods Frameworks */,
704553F43CA6F79D9961802D /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -319,7 +318,6 @@
607FACCD1AFB9204008FA782 /* Frameworks */,
607FACCE1AFB9204008FA782 /* Resources */,
04FCBC7D3D8FE68331FFA9EA /* [CP] Embed Pods Frameworks */,
A4988286A4270C32B90B0EA3 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -441,21 +439,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
704553F43CA6F79D9961802D /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
768B83D8207AB9EC51F5E74E /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -474,21 +457,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
A4988286A4270C32B90B0EA3 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AlamoRecord_Example/Pods-AlamoRecord_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
D629E9B379E7261E35D17333 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
42 changes: 26 additions & 16 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- Alamofire (4.5.1)
- AlamofireObjectMapper (5.0.0):
- Alamofire (4.7.3)
- AlamofireObjectMapper (5.1.0):
- Alamofire (~> 4.1)
- ObjectMapper (~> 3.0)
- AlamoRecord (1.0.4):
- AlamofireObjectMapper (~> 5.0)
- ObjectMapper (~> 3.3)
- AlamoRecord (1.1.1):
- AlamofireObjectMapper (~> 5.1)
- KeyboardSpy (1.1)
- MarqueeLabel/Swift (3.1.3)
- NotificationBannerSwift (1.5.1):
- MarqueeLabel/Swift (3.1.6)
- NotificationBannerSwift (1.6.3):
- MarqueeLabel/Swift
- SnapKit (~> 4.0)
- ObjectMapper (3.0.0)
- ObjectMapper (3.3.0)
- SnapKit (4.0.0)

DEPENDENCIES:
Expand All @@ -19,20 +19,30 @@ DEPENDENCIES:
- NotificationBannerSwift
- SnapKit

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Alamofire
- AlamofireObjectMapper
- KeyboardSpy
- MarqueeLabel
- NotificationBannerSwift
- ObjectMapper
- SnapKit

EXTERNAL SOURCES:
AlamoRecord:
:path: ../
:path: "../"

SPEC CHECKSUMS:
Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a
AlamofireObjectMapper: 5fafc816351cbbc0d486611aaeba7461c0cbad49
AlamoRecord: 3b9bd697dea11d12b33b19da3d55165201c7e290
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
AlamofireObjectMapper: 3395e698901d8b0e6f48b7d0c43bd47875325102
AlamoRecord: 4bf44f30cb7203de4298ef203a287663dc7c87bc
KeyboardSpy: 4552ddd413d3b856b3b396422fccb8e1b3008524
MarqueeLabel: baa5753dcbd36dca080e1f5c589a665aa5c906f1
NotificationBannerSwift: 666e6c392238561c17a52db4c50e6f00d9942e0d
ObjectMapper: 92230db59bf8f341a5c3a3cf0b9fbdde3cf0d87f
MarqueeLabel: 0c41f08ef5773e29c0f71064a8fa788a2fd8b365
NotificationBannerSwift: b231e4c3244848ef300e1c53ce027b9756b9b06f
ObjectMapper: b612bf8c8e99c4dc0bb6013a51f7c27966ed5da9
SnapKit: a42d492c16e80209130a3379f73596c3454b7694

PODFILE CHECKSUM: 3f63a2fa4d48882e49f031da151d69b53b92a842

COCOAPODS: 1.3.1
COCOAPODS: 1.5.3
2 changes: 1 addition & 1 deletion Example/Pods/Alamofire/LICENSE

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

Loading

0 comments on commit 4aacb76

Please sign in to comment.