Skip to content

Commit 68ae97d

Browse files
committed
[master] - Swift 5 Release
1 parent 29f3e83 commit 68ae97d

File tree

111 files changed

+2994
-1916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+2994
-1916
lines changed

AlamoRecord.podspec

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Pod::Spec.new do |s|
33
s.name = 'AlamoRecord'
4-
s.version = '1.3.1'
4+
s.version = '1.4.0'
55
s.summary = 'An elegant Alamofire wrapper inspired by ActiveRecord.'
66
s.description = <<-DESC
77
AlamoRecord is a powerful yet simple framework that eliminates the often complex networking layer that exists between your networking framework and your application. AlamoRecord uses the power of AlamoFire, AlamofireObjectMapper and the concepts behind the ActiveRecord pattern to create a networking layer that makes interacting with your API easier than ever.
@@ -11,13 +11,13 @@ AlamoRecord is a powerful yet simple framework that eliminates the often complex
1111
s.license = { :type => 'MIT', :file => 'LICENSE' }
1212
s.author = { 'Tunespeak' => 'daltonhint4@gmail.com' }
1313
s.source = { :git => 'https://github.com/tunespeak/AlamoRecord.git', :tag => s.version.to_s }
14-
s.swift_version = '4.2'
14+
s.swift_version = '5.0'
1515

16-
s.ios.deployment_target = '9.0'
17-
s.osx.deployment_target = '10.11'
18-
s.tvos.deployment_target = '9.0'
19-
s.watchos.deployment_target = '2.0'
16+
s.ios.deployment_target = '10.0'
17+
s.osx.deployment_target = '10.12'
18+
s.tvos.deployment_target = '10.0'
19+
s.watchos.deployment_target = '3.0'
2020

2121
s.source_files = 'AlamoRecord/Classes/**/*'
22-
s.dependency 'AlamofireObjectMapper', '~> 5.1'
22+
s.dependency 'AlamofireObjectMapper', '5.1.0'
2323
end

Example/AlamoRecord.xcodeproj/project.pbxproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -340,19 +340,19 @@
340340
TargetAttributes = {
341341
5C6346FA1F0B076B00158A80 = {
342342
CreatedOnToolsVersion = 8.3.2;
343-
LastSwiftMigration = 1000;
343+
LastSwiftMigration = 1020;
344344
ProvisioningStyle = Automatic;
345345
TestTargetID = 607FACCF1AFB9204008FA782;
346346
};
347347
607FACCF1AFB9204008FA782 = {
348348
CreatedOnToolsVersion = 6.3.1;
349-
LastSwiftMigration = 1000;
349+
LastSwiftMigration = 1020;
350350
};
351351
};
352352
};
353353
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "AlamoRecord" */;
354354
compatibilityVersion = "Xcode 3.2";
355-
developmentRegion = English;
355+
developmentRegion = en;
356356
hasScannedForEncodings = 0;
357357
knownRegions = (
358358
en,
@@ -395,7 +395,7 @@
395395
files = (
396396
);
397397
inputPaths = (
398-
"${SRCROOT}/Pods/Target Support Files/Pods-AlamoRecord_Example/Pods-AlamoRecord_Example-frameworks.sh",
398+
"${PODS_ROOT}/Target Support Files/Pods-AlamoRecord_Example/Pods-AlamoRecord_Example-frameworks.sh",
399399
"${BUILT_PRODUCTS_DIR}/AlamoRecord/AlamoRecord.framework",
400400
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
401401
"${BUILT_PRODUCTS_DIR}/AlamofireObjectMapper/AlamofireObjectMapper.framework",
@@ -418,7 +418,7 @@
418418
);
419419
runOnlyForDeploymentPostprocessing = 0;
420420
shellPath = /bin/sh;
421-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AlamoRecord_Example/Pods-AlamoRecord_Example-frameworks.sh\"\n";
421+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AlamoRecord_Example/Pods-AlamoRecord_Example-frameworks.sh\"\n";
422422
showEnvVarsInLog = 0;
423423
};
424424
10EDCB202AC52F940D80BDC9 /* [CP] Check Pods Manifest.lock */ = {
@@ -463,7 +463,7 @@
463463
files = (
464464
);
465465
inputPaths = (
466-
"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh",
466+
"${PODS_ROOT}/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh",
467467
"${BUILT_PRODUCTS_DIR}/AlamoRecord/AlamoRecord.framework",
468468
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
469469
"${BUILT_PRODUCTS_DIR}/AlamofireObjectMapper/AlamofireObjectMapper.framework",
@@ -478,7 +478,7 @@
478478
);
479479
runOnlyForDeploymentPostprocessing = 0;
480480
shellPath = /bin/sh;
481-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh\"\n";
481+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh\"\n";
482482
showEnvVarsInLog = 0;
483483
};
484484
/* End PBXShellScriptBuildPhase section */
@@ -579,7 +579,7 @@
579579
PRODUCT_NAME = "$(TARGET_NAME)";
580580
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
581581
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
582-
SWIFT_VERSION = 4.2;
582+
SWIFT_VERSION = 5.0;
583583
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AlamoRecord_Example.app/AlamoRecord_Example";
584584
};
585585
name = Debug;
@@ -597,7 +597,7 @@
597597
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
598598
PRODUCT_BUNDLE_IDENTIFIER = com.daltron.Tests;
599599
PRODUCT_NAME = "$(TARGET_NAME)";
600-
SWIFT_VERSION = 4.2;
600+
SWIFT_VERSION = 5.0;
601601
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AlamoRecord_Example.app/AlamoRecord_Example";
602602
};
603603
name = Release;
@@ -711,12 +711,12 @@
711711
buildSettings = {
712712
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
713713
INFOPLIST_FILE = AlamoRecord/Info.plist;
714-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
714+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
715715
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
716716
MODULE_NAME = ExampleApp;
717717
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
718718
PRODUCT_NAME = "$(TARGET_NAME)";
719-
SWIFT_VERSION = 4.2;
719+
SWIFT_VERSION = 5.0;
720720
};
721721
name = Debug;
722722
};
@@ -726,12 +726,12 @@
726726
buildSettings = {
727727
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
728728
INFOPLIST_FILE = AlamoRecord/Info.plist;
729-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
729+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
730730
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
731731
MODULE_NAME = ExampleApp;
732732
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
733733
PRODUCT_NAME = "$(TARGET_NAME)";
734-
SWIFT_VERSION = 4.2;
734+
SWIFT_VERSION = 5.0;
735735
};
736736
name = Release;
737737
};

Example/AlamoRecord.xcodeproj/xcshareddata/xcschemes/AlamoRecord-Example.xcscheme

Lines changed: 1 addition & 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 = "1000"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Example/Podfile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
platform :ios, '10.0'
12
use_frameworks!
2-
platform :ios, '9.0'
3+
inhibit_all_warnings!
34

45
target 'AlamoRecord_Example' do
56
pod 'AlamoRecord', :path => '../'
@@ -11,3 +12,15 @@ end
1112
target 'Tests' do
1213
pod 'AlamoRecord', :path => '../'
1314
end
15+
16+
post_install do |installer|
17+
installer.pods_project.targets.each do |target|
18+
19+
if ['KeyboardSpy'].include? target.name
20+
target.build_configurations.each do |config|
21+
config.build_settings['SWIFT_VERSION'] = '4.0'
22+
end
23+
end
24+
25+
end
26+
end

Example/Podfile.lock

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
PODS:
2-
- Alamofire (4.7.3)
2+
- Alamofire (4.8.2)
33
- AlamofireObjectMapper (5.1.0):
44
- Alamofire (~> 4.1)
55
- ObjectMapper (~> 3.3)
6-
- AlamoRecord (1.1.1):
7-
- AlamofireObjectMapper (~> 5.1)
6+
- AlamoRecord (1.4.0):
7+
- AlamofireObjectMapper (= 5.1.0)
88
- KeyboardSpy (1.1)
9-
- MarqueeLabel/Swift (3.1.6)
10-
- NotificationBannerSwift (1.6.3):
11-
- MarqueeLabel/Swift
12-
- SnapKit (~> 4.0)
13-
- ObjectMapper (3.3.0)
14-
- SnapKit (4.0.0)
9+
- MarqueeLabel (4.0.0)
10+
- NotificationBannerSwift (2.2.0):
11+
- MarqueeLabel (~> 4.0.0)
12+
- SnapKit (~> 5.0.0)
13+
- ObjectMapper (3.4.2)
14+
- SnapKit (5.0.0)
1515

1616
DEPENDENCIES:
1717
- AlamoRecord (from `../`)
@@ -34,15 +34,15 @@ EXTERNAL SOURCES:
3434
:path: "../"
3535

3636
SPEC CHECKSUMS:
37-
Alamofire: c7287b6e5d7da964a70935e5db17046b7fde6568
37+
Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
3838
AlamofireObjectMapper: 3395e698901d8b0e6f48b7d0c43bd47875325102
39-
AlamoRecord: 4bf44f30cb7203de4298ef203a287663dc7c87bc
39+
AlamoRecord: f7ff85c04c4637a1d3ceb916bb079e1e2311f232
4040
KeyboardSpy: 4552ddd413d3b856b3b396422fccb8e1b3008524
41-
MarqueeLabel: 0c41f08ef5773e29c0f71064a8fa788a2fd8b365
42-
NotificationBannerSwift: b231e4c3244848ef300e1c53ce027b9756b9b06f
43-
ObjectMapper: b612bf8c8e99c4dc0bb6013a51f7c27966ed5da9
44-
SnapKit: a42d492c16e80209130a3379f73596c3454b7694
41+
MarqueeLabel: b55b26e690b6ad41faedd95cbf5eae6f1d1735b4
42+
NotificationBannerSwift: 0ebb4b35e18c0515fdfe01b5ebd90c3eb1255e3d
43+
ObjectMapper: 0d4402610f4e468903ae64629eec4784531e5c51
44+
SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf
4545

46-
PODFILE CHECKSUM: 3f63a2fa4d48882e49f031da151d69b53b92a842
46+
PODFILE CHECKSUM: f5d73d86856e49073d0206d4e3f83582b8a8a64b
4747

48-
COCOAPODS: 1.5.3
48+
COCOAPODS: 1.6.1

Example/Pods/Alamofire/LICENSE

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Alamofire/README.md

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Alamofire/Source/AFError.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Alamofire/Source/Alamofire.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Alamofire/Source/DispatchQueue+Alamofire.swift

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)