Skip to content

Commit

Permalink
Merge pull request #49 from marty-suzuki/swift5
Browse files Browse the repository at this point in the history
Support Swift5
  • Loading branch information
marty-suzuki authored Sep 30, 2019
2 parents 94719e9 + bde659e commit 5fbdc9e
Show file tree
Hide file tree
Showing 16 changed files with 477 additions and 356 deletions.
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

25 changes: 5 additions & 20 deletions Example/MisterFusionSample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
37F35B1B1BF625AB008C6EAB /* Frameworks */,
37F35B1C1BF625AB008C6EAB /* Resources */,
36C33B9F33E677EFFD9A317C /* [CP] Embed Pods Frameworks */,
9DF28894AC63573ACB22DA4D /* [CP] Copy Pods Resources */,
1308C3345AB243F5655EE9DB /* Embed Pods Frameworks */,
);
buildRules = (
Expand Down Expand Up @@ -146,6 +145,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -194,7 +194,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-MisterFusionSample/Pods-MisterFusionSample-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-MisterFusionSample/Pods-MisterFusionSample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/MisterFusion/MisterFusion.framework",
);
name = "[CP] Embed Pods Frameworks";
Expand All @@ -203,22 +203,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MisterFusionSample/Pods-MisterFusionSample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
9DF28894AC63573ACB22DA4D /* [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-MisterFusionSample/Pods-MisterFusionSample-resources.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MisterFusionSample/Pods-MisterFusionSample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
A294C3F6ADDE89566922D859 /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -394,7 +379,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "MisterFusionSample/MisterFusionSample-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -411,7 +396,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "szk-atmosphere.MisterFusionSample";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "MisterFusionSample/MisterFusionSample-Bridging-Header.h";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- MisterFusion (3.1.1)
- MisterFusion (5.0.0)

DEPENDENCIES:
- MisterFusion (from `../`)

EXTERNAL SOURCES:
MisterFusion:
:path: ../
:path: "../"

SPEC CHECKSUMS:
MisterFusion: 27793d2b0afd5745e3ce5f97d2262866bf5fa151
MisterFusion: 536b0f57d2d4b775e3c9ce436e211ed293c5e01a

PODFILE CHECKSUM: 697854e68eca36a1daa2f08cd9769007f4aacc68

COCOAPODS: 1.3.0
COCOAPODS: 1.8.1
11 changes: 7 additions & 4 deletions Example/Pods/Local Podspecs/MisterFusion.podspec.json

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

8 changes: 4 additions & 4 deletions Example/Pods/Manifest.lock

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

577 changes: 299 additions & 278 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

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

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

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

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

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

Loading

0 comments on commit 5fbdc9e

Please sign in to comment.