Skip to content

Commit

Permalink
Merge pull request #25 from lovoo/feature/swift5
Browse files Browse the repository at this point in the history
Bump to Swift 5
  • Loading branch information
fabianehlert authored Jun 10, 2022
2 parents 91bcb57 + d3f33e8 commit ac99111
Show file tree
Hide file tree
Showing 17 changed files with 591 additions and 436 deletions.
17 changes: 9 additions & 8 deletions Example/NSFWDetector.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@
TargetAttributes = {
607FACCF1AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0900;
LastSwiftMigration = 1340;
};
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0900;
LastSwiftMigration = 1340;
TestTargetID = 607FACCF1AFB9204008FA782;
};
};
Expand All @@ -235,6 +235,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -313,7 +314,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-NSFWDetector_Example/Pods-NSFWDetector_Example-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-NSFWDetector_Example/Pods-NSFWDetector_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/NSFWDetector/NSFWDetector.framework",
);
name = "[CP] Embed Pods Frameworks";
Expand All @@ -322,7 +323,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-NSFWDetector_Example/Pods-NSFWDetector_Example-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NSFWDetector_Example/Pods-NSFWDetector_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -494,7 +495,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -510,7 +511,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -528,7 +529,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NSFWDetector_Example.app/NSFWDetector_Example";
};
name = Debug;
Expand All @@ -543,7 +544,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NSFWDetector_Example.app/NSFWDetector_Example";
};
name = Release;
Expand Down
6 changes: 3 additions & 3 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- NSFWDetector (1.1.0)
- NSFWDetector (1.1.2)

DEPENDENCIES:
- NSFWDetector (from `../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
NSFWDetector: 5158164f5e716652aa61cfa92dc7b252a6883415
NSFWDetector: d6eca9759743b5e43778818078d53711576e929f

PODFILE CHECKSUM: f9a9c6821210dfbaf2efbedd233ddc769e77db55

COCOAPODS: 1.5.3
COCOAPODS: 1.11.2
11 changes: 6 additions & 5 deletions Example/Pods/Local Podspecs/NSFWDetector.podspec.json

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

6 changes: 3 additions & 3 deletions Example/Pods/Manifest.lock

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

726 changes: 363 additions & 363 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.

Loading

0 comments on commit ac99111

Please sign in to comment.