Skip to content

Commit 82d635e

Browse files
author
Rafael da Silva Ferreira
committed
Use BaseMappable instead Mappable
To make it work with Mappable and ImmutableMappable instances.
1 parent bb85daf commit 82d635e

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

Example/JSONStub.xcodeproj/project.pbxproj

+12-4
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,12 @@
243243
TargetAttributes = {
244244
607FACCF1AFB9204008FA782 = {
245245
CreatedOnToolsVersion = 6.3.1;
246+
DevelopmentTeam = LQ5WW9469F;
246247
LastSwiftMigration = 0800;
247248
};
248249
607FACE41AFB9204008FA782 = {
249250
CreatedOnToolsVersion = 6.3.1;
251+
DevelopmentTeam = LQ5WW9469F;
250252
LastSwiftMigration = 0800;
251253
TestTargetID = 607FACCF1AFB9204008FA782;
252254
};
@@ -473,7 +475,7 @@
473475
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
474476
GCC_WARN_UNUSED_FUNCTION = YES;
475477
GCC_WARN_UNUSED_VARIABLE = YES;
476-
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
478+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
477479
MTL_ENABLE_DEBUG_INFO = YES;
478480
ONLY_ACTIVE_ARCH = YES;
479481
SDKROOT = iphoneos;
@@ -514,7 +516,7 @@
514516
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
515517
GCC_WARN_UNUSED_FUNCTION = YES;
516518
GCC_WARN_UNUSED_VARIABLE = YES;
517-
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
519+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
518520
MTL_ENABLE_DEBUG_INFO = NO;
519521
SDKROOT = iphoneos;
520522
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -528,6 +530,7 @@
528530
buildSettings = {
529531
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
530532
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
533+
DEVELOPMENT_TEAM = LQ5WW9469F;
531534
INFOPLIST_FILE = "Example for JSONStub/Supporting Files/Info.plist";
532535
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
533536
MODULE_NAME = ExampleApp;
@@ -543,6 +546,7 @@
543546
buildSettings = {
544547
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
545548
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
549+
DEVELOPMENT_TEAM = LQ5WW9469F;
546550
INFOPLIST_FILE = "Example for JSONStub/Supporting Files/Info.plist";
547551
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
548552
MODULE_NAME = ExampleApp;
@@ -556,7 +560,8 @@
556560
isa = XCBuildConfiguration;
557561
baseConfigurationReference = FA7CCFCFB3ACC3FE2D121ED5 /* Pods-JSONStub_Tests.debug.xcconfig */;
558562
buildSettings = {
559-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
563+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
564+
DEVELOPMENT_TEAM = LQ5WW9469F;
560565
FRAMEWORK_SEARCH_PATHS = (
561566
"$(SDKROOT)/Developer/Library/Frameworks",
562567
"$(inherited)",
@@ -570,14 +575,16 @@
570575
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
571576
PRODUCT_NAME = "$(TARGET_NAME)";
572577
SWIFT_VERSION = 3.0;
578+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/JSONStub_Example.app/JSONStub_Example";
573579
};
574580
name = Debug;
575581
};
576582
607FACF41AFB9204008FA782 /* Release */ = {
577583
isa = XCBuildConfiguration;
578584
baseConfigurationReference = 5381E551C198CAD95D622240 /* Pods-JSONStub_Tests.release.xcconfig */;
579585
buildSettings = {
580-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
586+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
587+
DEVELOPMENT_TEAM = LQ5WW9469F;
581588
FRAMEWORK_SEARCH_PATHS = (
582589
"$(SDKROOT)/Developer/Library/Frameworks",
583590
"$(inherited)",
@@ -587,6 +594,7 @@
587594
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
588595
PRODUCT_NAME = "$(TARGET_NAME)";
589596
SWIFT_VERSION = 3.0;
597+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/JSONStub_Example.app/JSONStub_Example";
590598
};
591599
name = Release;
592600
};

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</BuildActionEntry>
2323
<BuildActionEntry
2424
buildForTesting = "YES"
25-
buildForRunning = "YES"
25+
buildForRunning = "NO"
2626
buildForProfiling = "NO"
2727
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
28+
buildForAnalyzing = "NO">
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
3131
BlueprintIdentifier = "607FACE41AFB9204008FA782"

JSONStub.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'JSONStub'
11-
s.version = '0.1.0'
11+
s.version = '0.1.1'
1212
s.summary = 'Use JSONStub to easily load JSON files into your Mappable objects.'
1313

1414
# This description is used to generate tags and improve search results.

JSONStub/Classes/Mappable.swift JSONStub/Classes/BaseMappable.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Mappable.swift
2+
// BaseMappable.swift
33
// NuChargebackTests
44
//
55
// Created by Rafael Ferreira on 10/5/16.
@@ -8,7 +8,7 @@
88

99
import ObjectMapper
1010

11-
public extension Mappable {
11+
public extension BaseMappable {
1212
init?(fromFileName file: String) {
1313
guard let json = file.fileDictionary() else { return nil }
1414

0 commit comments

Comments
 (0)