Skip to content

Commit

Permalink
Moved SwiftyJSON version compatible with 4.2 into pod
Browse files Browse the repository at this point in the history
  • Loading branch information
Harlan Kellaway committed May 30, 2019
1 parent 5aa1c55 commit b3db349
Show file tree
Hide file tree
Showing 66 changed files with 9,529 additions and 16 deletions.
3 changes: 1 addition & 2 deletions Kumi.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ This framework provides all the values for fonts and colors you need to apply a
s.source = { :git => "https://github.com/prolificinteractive/Kumi-iOS.git", :tag => s.version.to_s }

s.ios.deployment_target = '9.0'
s.source_files = 'Kumi/Core/**/*'
s.source_files = 'Kumi/Core/**/*', 'Kumi/SwiftyJSON-4.2.0/Source/*'

s.dependency 'Marker'
s.dependency 'SwiftyJSON'
end
6 changes: 2 additions & 4 deletions Kumi.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -538,20 +538,18 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-KumiTests/Pods-KumiTests-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-KumiTests/Pods-KumiTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Kumi/Kumi.framework",
"${BUILT_PRODUCTS_DIR}/Marker/Marker.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kumi.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Marker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-KumiTests/Pods-KumiTests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-KumiTests/Pods-KumiTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D8759F2CF40E51A495AC2621 /* [CP] Check Pods Manifest.lock */ = {
Expand Down
33 changes: 33 additions & 0 deletions Kumi/SwiftyJSON-4.2.0/.github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
### What did you do?

Please replace this with what you did.

### What did you expect to happen?

Please replace this with what you expected to happen.

### What actually happened instead?

Please replace this with what happened instead.

### Environment

List the software versions you're using:

- SwiftyJSON: *?.?.?*
- Xcode Version: *?.? (????)* (Open Xcode; In menubar: Xcode > About Xcode)
- Swift Version: *?.?* (Open Xcode Preferences; Components > Toolchains. If none, use `Xcode Default`.)

Please also mention which package manager you used and its version. Delete the
other package managers in this list:

- Cocoapods: *?.?.?* (Use `pod --version` in Terminal)
- Carthage: *?.?* (Use `carthage version` in Terminal)
- Swift Package Manager *?.?.? (swiftpm-???)* (Use `swift build --version` in Terminal)

### Project that demonstrates the issue

Please link to a project we can download that reproduces the issue. Feel free
to delete this section if it's not relevant to the issue (eg - feature request).

The project should be [short, self-contained, and correct example](http://sscce.org/).
13 changes: 13 additions & 0 deletions Kumi/SwiftyJSON-4.2.0/.github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
The PR should summarize what was changed and why. Here are some questions to
help you if you're not sure:

- What behavior was changed?
- What code was refactored / updated to support this change?
- What issues are related to this PR? Or why was this change introduced?

Checklist - While not every PR needs it, new features should consider this list:

- [ ] Does this have tests?
- [ ] Does this have documentation?
- [ ] Does this break the public API (Requires major version bump)?
- [ ] Is this a new feature (Requires minor version bump)?
24 changes: 24 additions & 0 deletions Kumi/SwiftyJSON-4.2.0/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Xcode
.DS_Store
*/build/*
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
profile
*.moved-aside
DerivedData
.idea/
*.hmap
*.xccheckout

#CocoaPods
Pods

#Carthage
Carthage/Build
2 changes: 2 additions & 0 deletions Kumi/SwiftyJSON-4.2.0/.hound.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
swift:
config_file: .swiftlint.yml
10 changes: 10 additions & 0 deletions Kumi/SwiftyJSON-4.2.0/.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
disabled_rules:
- force_cast
- force_try
- variable_name
- type_name
- file_length
- line_length
- type_body_length
- cyclomatic_complexity
- function_body_length
8 changes: 8 additions & 0 deletions Kumi/SwiftyJSON-4.2.0/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
language: objective-c
osx_image: xcode10
xcode_sdk: iphonesimulator12.0
script:
- set -o pipefail
- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON iOS" -destination "platform=iOS Simulator,name=iPhone 6" build-for-testing test | xcpretty
- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON macOS" build-for-testing test | xcpretty
- travis_retry xcodebuild -workspace SwiftyJSON.xcworkspace -scheme "SwiftyJSON tvOS" -destination "platform=tvOS Simulator,name=Apple TV" build-for-testing test | xcpretty
Loading

0 comments on commit b3db349

Please sign in to comment.