Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

1 change: 0 additions & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!
platform :ios, '9.0'

Expand Down
74 changes: 44 additions & 30 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
PODS:
- AEXML (4.1.0)
- BrightFutures (6.0.0):
- AEXML (4.5.0)
- BrightFutures (6.0.1):
- Result (~> 3.2.4)
- Fuzi (2.0.1)
- Fuzi (2.2.1)
- ISO8601 (0.6.0)
- Mockingjay (2.0.1):
- Mockingjay/Core (= 2.0.1)
- Mockingjay/XCTest (= 2.0.1)
- Mockingjay/Core (2.0.1):
- URITemplate (~> 2.0)
- Mockingjay/XCTest (2.0.1):
- Mockingjay (3.0.0-alpha.1):
- Mockingjay/Core (= 3.0.0-alpha.1)
- Mockingjay/XCTest (= 3.0.0-alpha.1)
- Mockingjay/Core (3.0.0-alpha.1):
- URITemplate (~> 3.0)
- Mockingjay/XCTest (3.0.0-alpha.1):
- Mockingjay/Core
- Nimble (7.0.2)
- OHHTTPStubs/Core (6.1.0)
- OHHTTPStubs/NSURLSession (6.1.0):
- Nimble (8.0.9)
- OHHTTPStubs/Core (9.0.0)
- OHHTTPStubs/NSURLSession (9.0.0):
- OHHTTPStubs/Core
- Quick (1.2.0)
- Quick (2.2.0)
- Result (3.2.4)
- Toki (0.12.0):
- AEXML
- Fuzi
- Mockingjay (~> 2.0)
- OHHTTPStubs/NSURLSession (~> 6.1)
- Mockingjay (>= 3.0.0-alpha.1)
- OHHTTPStubs/NSURLSession (~> 9.0)
- WSDL2Swift (>= 0.7)
- URITemplate (2.0.3)
- WSDL2Swift (0.8.0):
- URITemplate (3.0.0)
- WSDL2Swift (0.9.0):
- AEXML
- BrightFutures (< 7.0.0, >= 6.0.0-beta.1)
- Fuzi (~> 2.0)
Expand All @@ -35,24 +35,38 @@ DEPENDENCIES:
- Quick
- Toki (from `../`)

SPEC REPOS:
trunk:
- AEXML
- BrightFutures
- Fuzi
- ISO8601
- Mockingjay
- Nimble
- OHHTTPStubs
- Quick
- Result
- URITemplate
- WSDL2Swift

EXTERNAL SOURCES:
Toki:
:path: ../
:path: "../"

SPEC CHECKSUMS:
AEXML: 647fbb051280f3fb38a1a7caa62b0344055a851c
BrightFutures: 9e7604f511aed9f0d6a49b04ac9b3fca6b117758
Fuzi: f64983dea705491d3aedd32351247a09523e7efd
AEXML: 0e8f1d874fa033ca6b3909452a8bc362faad46e6
BrightFutures: 9c03dab79e73ffe504b7bafc15c5bfdaeee54890
Fuzi: 3e6c73359d84a92376763abbaf8ced4d49c0f4ea
ISO8601: d3ea3ba9b752820cf92c6b47a9ee327e9f0e13fc
Mockingjay: 11a621880d2887f1775bdcf824341eb68f218450
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
Mockingjay: 0f7c5aa49c7f1b95621cee3c79b557141f5a225c
Nimble: 98b888285a615fd34f20e61753cf58ea1402bde4
OHHTTPStubs: cb29d2a9d09a828ecb93349a2b0c64f99e0db89f
Quick: 7fb19e13be07b5dfb3b90d4f9824c855a11af40e
Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
Toki: 34dee16012ad6927c9dbc881e6d11b8479ca76c0
URITemplate: ace0c4c46dcf8afe6e89b4060621852886b15c3b
WSDL2Swift: 79e88684ce544126e3f07ad2a44c75b483c11c14
Toki: b0a48ebabf6892ba543e6a531c07181b66b951ea
URITemplate: 58e0d47f967006c5d59888af5356c4a8ed3b197d
WSDL2Swift: 1aaa3d2fcb01e893e4d8e9f503d6b9214f1efb87

PODFILE CHECKSUM: ae018381b97cd7d3988c8330b8ed69418971a125
PODFILE CHECKSUM: 8fc6235e97b66dba0fce8b9f1d68524341568650

COCOAPODS: 1.3.1
COCOAPODS: 1.9.2
36 changes: 13 additions & 23 deletions Example/Toki.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
E768343256443551FE1E16E4 /* Pods-Toki_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Toki_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Toki_Tests/Pods-Toki_Tests.debug.xcconfig"; sourceTree = "<group>"; };
EA22C3381E0782C0007CE1CF /* WSDL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WSDL.swift; sourceTree = "<group>"; };
EA53AB971C92C8B6002025F1 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; };
EB136BFD5377FD9715AD81F9 /* Toki.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Toki.podspec; path = ../Toki.podspec; sourceTree = "<group>"; };
EB136BFD5377FD9715AD81F9 /* Toki.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Toki.podspec; path = ../Toki.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -125,7 +125,6 @@
607FACE21AFB9204008FA782 /* Frameworks */,
607FACE31AFB9204008FA782 /* Resources */,
51B5D7DCC2052466EB8ED1A0 /* [CP] Embed Pods Frameworks */,
C73910AF0AF9CEC80BF80129 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -143,7 +142,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0910;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = CocoaPods;
TargetAttributes = {
607FACE41AFB9204008FA782 = {
Expand All @@ -153,7 +152,7 @@
};
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "Toki" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -186,7 +185,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Toki_Tests/Pods-Toki_Tests-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-Toki_Tests/Pods-Toki_Tests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AEXML/AEXML.framework",
"${BUILT_PRODUCTS_DIR}/BrightFutures/BrightFutures.framework",
"${BUILT_PRODUCTS_DIR}/Fuzi/Fuzi.framework",
Expand Down Expand Up @@ -217,7 +216,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Toki_Tests/Pods-Toki_Tests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Toki_Tests/Pods-Toki_Tests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
AB81A19DA0DFF145683CF84A /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -238,21 +237,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;
};
C73910AF0AF9CEC80BF80129 /* [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-Toki_Tests/Pods-Toki_Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -272,6 +256,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -280,12 +265,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -319,14 +306,15 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
607FACEE1AFB9204008FA782 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -335,12 +323,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand All @@ -366,7 +356,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down
26 changes: 10 additions & 16 deletions Example/Toki.xcodeproj/xcshareddata/xcschemes/Toki-Example.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0910"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -40,8 +40,16 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
BuildableName = "Toki_Example.app"
BlueprintName = "Toki_Example"
ReferencedContainer = "container:Toki.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -54,23 +62,11 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
BuildableName = "Toki_Example.app"
BlueprintName = "Toki_Example"
ReferencedContainer = "container:Toki.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand All @@ -87,8 +83,6 @@
ReferencedContainer = "container:Toki.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
8 changes: 4 additions & 4 deletions Toki.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/banjun/Toki.git", :tag => s.version.to_s }
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.11'
s.swift_versions = ['5.0']
s.requires_arc = true
s.source_files = 'Pod/Classes/**/*'
s.frameworks = 'XCTest'
s.dependency 'Mockingjay', '~> 2.0'
s.dependency 'OHHTTPStubs/NSURLSession', '~> 6.1'
s.dependency 'Mockingjay', '>= 3.0.0-alpha.1'
s.dependency 'OHHTTPStubs/NSURLSession', '~> 9.0'
s.dependency 'AEXML'
s.dependency 'WSDL2Swift', '>= 0.7'
s.dependency 'Fuzi'
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO',
'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2'} # for importing Fuzi with Swift 4
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
end