Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.

Converted to Swift 5 #1

Open
mihaelamj wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Converted to Swift 5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78eb55e
converting to swift 4.2
mihaelamj May 20, 2019
379ff8c
converting to swift 4.2
mihaelamj May 20, 2019
fb5247c
converted to swift 5
mihaelamj May 20, 2019
d0f33a8
changed text color
mihaelamj May 20, 2019
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
30 changes: 24 additions & 6 deletions SampleCodeStalker.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,18 +241,18 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = "Thomas Krajacic";
TargetAttributes = {
44C344841C5362CB0068AD9D = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0800;
LastSwiftMigration = 1020;
};
};
};
buildConfigurationList = 44C344801C5362CB0068AD9D /* Build configuration list for PBXProject "SampleCodeStalker" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -293,7 +293,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "#!/bin/bash\n# Xcode: Set version and build number from Git\n# --------------------------------------------\n#\n# This script sets the version number `CFBundleShortVersionString` to one of\n#\n# - `1.2.3` -- for the tagged commit `v1.2.3` or a hyphen-separated prerelease,\n# e.g. `v1.2.3-alpha`, `v1.2.3-alpha.2`, `v1.2.3-beta`, `v1.2.3-rc`.\n# - `1.2.3-7-gabc1234` -- at commit `abc1234`, 7 commits after `v1.2.3`,\n# - `1.2.3-7-gabc1234-dirty` -- when there are uncommitted changes, or\n# - `abc1234` or `abc1234-dirty`, respectively -- if there is no previous tag.\n#\n# and the build number `CFBundleVersion` to the number of Git commits up to the\n# current `HEAD`. (That should be a pretty much monotonically growing number\n# that is okay for the App Store. If not,)\n#\n# When about to release a new version, create a prerelease like\n#\n# git tag v1.2.3-rc.1\n#\n# and then build and archive. The script strips the hyphen-separated part from\n# the resulting binary\n#\n# Once everything looks okay and the release is tested\n# to work, set the version in stone, with release notes in the message, by running:\n#\n# git tag -s v1.2.3 # signed using your GPG key\n# git tag -a v1.2.3 # unsigned\n#\n# Remember to push the tags to origin too:\n#\n# git push --tags origin\n#\n# Read more about semantic versioning: http://semver.org\n\n\nset -e\n\nfunction strip-v () { echo -n \"${1#v}\"; }\nfunction strip-pre () { local x=\"${1#v}\"; echo -n \"${x%-*}\"; }\n\nPLIST=\"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH%.*}\"\n\nif [[ -d \"${SRCROOT}/.git\" ]];\nthen\n\nCOMMIT=$(git --git-dir=\"${SRCROOT}/.git\" rev-parse HEAD)\n\nLATEST=$(git describe --tags --abbrev=0 --match 'v[0-9]*' 2> /dev/null || true)\nSTATIC=\"$(defaults read \"${SRCROOT}/${INFOPLIST_FILE}\" \"CFBundleShortVersionString\" 2> /dev/null || true)\"\nif [[ -n \"$STATIC\" ]] && [[ \"$STATIC\" != $(strip-pre \"${LATEST}\") ]];\nthen\necho \"warning: CFBundleShortVersionString ${STATIC} disagrees with tag ${LATEST}\"\nfi\n\nTAG=$(strip-pre $(git describe --tags --match 'v[0-9]*' --abbrev=0 --exact-match 2> /dev/null || true))\nFULL_VERSION=$(strip-v $(git describe --tags --match 'v[0-9]*' --always --dirty))\nBUILD=$(echo -n $(git rev-list HEAD | wc -l))\nif [[ \"${FULL_VERSION}\" == *\"-dirty\" ]];\nthen\necho \"warning: There are uncommitted changes in Git\"\nSHORT_VERSION=\"${FULL_VERSION}\"\nelse\nSHORT_VERSION=\"${TAG:-${FULL_VERSION}}\"\nfi\n\ndefaults write \"${PLIST}\" \"CFBundleShortVersionString\" -string \"${SHORT_VERSION}\"\ndefaults write \"${PLIST}\" \"CFBundleVersion\" -string \"${BUILD}\"\ndefaults write \"${PLIST}\" \"Commit\" -string \"${COMMIT}\"\n\nelse\n\necho \"warning: Building outside Git. Leaving version number untouched.\"\n\nfi\n\necho \"CFBundleIdentifier:\" \"$(defaults read \"${PLIST}\" CFBundleIdentifier)\"\necho \"CFBundleShortVersionString:\" \"$(defaults read \"${PLIST}\" CFBundleShortVersionString)\"\necho \"CFBundleVersion:\" \"$(defaults read \"${PLIST}\" CFBundleVersion)\"";
shellScript = "#!/bin/bash\n# Xcode: Set version and build number from Git\n# --------------------------------------------\n#\n# This script sets the version number `CFBundleShortVersionString` to one of\n#\n# - `1.2.3` -- for the tagged commit `v1.2.3` or a hyphen-separated prerelease,\n# e.g. `v1.2.3-alpha`, `v1.2.3-alpha.2`, `v1.2.3-beta`, `v1.2.3-rc`.\n# - `1.2.3-7-gabc1234` -- at commit `abc1234`, 7 commits after `v1.2.3`,\n# - `1.2.3-7-gabc1234-dirty` -- when there are uncommitted changes, or\n# - `abc1234` or `abc1234-dirty`, respectively -- if there is no previous tag.\n#\n# and the build number `CFBundleVersion` to the number of Git commits up to the\n# current `HEAD`. (That should be a pretty much monotonically growing number\n# that is okay for the App Store. If not,)\n#\n# When about to release a new version, create a prerelease like\n#\n# git tag v1.2.3-rc.1\n#\n# and then build and archive. The script strips the hyphen-separated part from\n# the resulting binary\n#\n# Once everything looks okay and the release is tested\n# to work, set the version in stone, with release notes in the message, by running:\n#\n# git tag -s v1.2.3 # signed using your GPG key\n# git tag -a v1.2.3 # unsigned\n#\n# Remember to push the tags to origin too:\n#\n# git push --tags origin\n#\n# Read more about semantic versioning: http://semver.org\n\n\nset -e\n\nfunction strip-v () { echo -n \"${1#v}\"; }\nfunction strip-pre () { local x=\"${1#v}\"; echo -n \"${x%-*}\"; }\n\nPLIST=\"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH%.*}\"\n\nif [[ -d \"${SRCROOT}/.git\" ]];\nthen\n\nCOMMIT=$(git --git-dir=\"${SRCROOT}/.git\" rev-parse HEAD)\n\nLATEST=$(git describe --tags --abbrev=0 --match 'v[0-9]*' 2> /dev/null || true)\nSTATIC=\"$(defaults read \"${SRCROOT}/${INFOPLIST_FILE}\" \"CFBundleShortVersionString\" 2> /dev/null || true)\"\nif [[ -n \"$STATIC\" ]] && [[ \"$STATIC\" != $(strip-pre \"${LATEST}\") ]];\nthen\necho \"warning: CFBundleShortVersionString ${STATIC} disagrees with tag ${LATEST}\"\nfi\n\nTAG=$(strip-pre $(git describe --tags --match 'v[0-9]*' --abbrev=0 --exact-match 2> /dev/null || true))\nFULL_VERSION=$(strip-v $(git describe --tags --match 'v[0-9]*' --always --dirty))\nBUILD=$(echo -n $(git rev-list HEAD | wc -l))\nif [[ \"${FULL_VERSION}\" == *\"-dirty\" ]];\nthen\necho \"warning: There are uncommitted changes in Git\"\nSHORT_VERSION=\"${FULL_VERSION}\"\nelse\nSHORT_VERSION=\"${TAG:-${FULL_VERSION}}\"\nfi\n\ndefaults write \"${PLIST}\" \"CFBundleShortVersionString\" -string \"${SHORT_VERSION}\"\ndefaults write \"${PLIST}\" \"CFBundleVersion\" -string \"${BUILD}\"\ndefaults write \"${PLIST}\" \"Commit\" -string \"${COMMIT}\"\n\nelse\n\necho \"warning: Building outside Git. Leaving version number untouched.\"\n\nfi\n\necho \"CFBundleIdentifier:\" \"$(defaults read \"${PLIST}\" CFBundleIdentifier)\"\necho \"CFBundleShortVersionString:\" \"$(defaults read \"${PLIST}\" CFBundleShortVersionString)\"\necho \"CFBundleVersion:\" \"$(defaults read \"${PLIST}\" CFBundleVersion)\"\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -360,14 +360,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
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;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -395,6 +403,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -406,14 +415,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
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;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -434,6 +451,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -446,7 +464,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = at.krajacic.SampleCodeStalker;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -459,7 +477,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = at.krajacic.SampleCodeStalker;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions SampleCodeStalker.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
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>
Loading