From b92a32ded0f3d5eca0de8399abc519bacc74eb7d Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Tue, 25 Jun 2019 16:04:34 +0300 Subject: [PATCH 01/12] Xcode 11 * remove Carthage * using SwiftPM --- Cartfile | 1 - Cartfile.resolved | 1 - QminderAPI.xcodeproj/project.pbxproj | 208 ++++++++++-------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/swiftpm/Package.resolved | 16 ++ .../xcschemes/QminderAPI-iOS.xcscheme | 26 +-- build.sh | 6 + 7 files changed, 156 insertions(+), 104 deletions(-) delete mode 100644 Cartfile delete mode 100644 Cartfile.resolved create mode 100644 QminderAPI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100755 build.sh diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 08922e5..0000000 --- a/Cartfile +++ /dev/null @@ -1 +0,0 @@ -github "daltoniam/Starscream" diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index c76f727..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1 +0,0 @@ -github "daltoniam/Starscream" "3.1.0" diff --git a/QminderAPI.xcodeproj/project.pbxproj b/QminderAPI.xcodeproj/project.pbxproj index d850c00..4c2ede3 100644 --- a/QminderAPI.xcodeproj/project.pbxproj +++ b/QminderAPI.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -56,7 +56,6 @@ 6320D863204D81580041FFAC /* ParameterEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63520634204D78E5008C8C54 /* ParameterEncoding.swift */; }; 6320D864204D815B0041FFAC /* ResultProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63520631204D78E5008C8C54 /* ResultProtocol.swift */; }; 6320D867204D81660041FFAC /* QminderAPI.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 6320D866204D81660041FFAC /* QminderAPI.podspec */; }; - 6320D868204D81A70041FFAC /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63520674204D7966008C8C54 /* Starscream.framework */; }; 6320D86B204D83310041FFAC /* QminderAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6320D83F204D806D0041FFAC /* QminderAPI.framework */; }; 635206AC204D7A2A008C8C54 /* ResultProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63520631204D78E5008C8C54 /* ResultProtocol.swift */; }; 635206AE204D7A2B008C8C54 /* ResultProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63520631204D78E5008C8C54 /* ResultProtocol.swift */; }; @@ -145,13 +144,14 @@ 63520706204D7A4B008C8C54 /* LinesEventResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63520650204D78E5008C8C54 /* LinesEventResponse.swift */; }; 63520707204D7A4B008C8C54 /* DeviceEventResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63520651204D78E5008C8C54 /* DeviceEventResponse.swift */; }; 63520708204D7A4B008C8C54 /* TicketEventResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63520652204D78E5008C8C54 /* TicketEventResponse.swift */; }; - 6352070A204D7A55008C8C54 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63520709204D7A55008C8C54 /* Starscream.framework */; }; - 6352070C204D7A64008C8C54 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6352070B204D7A64008C8C54 /* Starscream.framework */; }; - 6352070E204D7A6B008C8C54 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6352070D204D7A6B008C8C54 /* Starscream.framework */; }; 635BDB66210B296B000EFDEC /* Loggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635BDB65210B296B000EFDEC /* Loggable.swift */; }; 635BDB67210B296B000EFDEC /* Loggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635BDB65210B296B000EFDEC /* Loggable.swift */; }; 635BDB68210B296B000EFDEC /* Loggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635BDB65210B296B000EFDEC /* Loggable.swift */; }; 635BDB69210B296B000EFDEC /* Loggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 635BDB65210B296B000EFDEC /* Loggable.swift */; }; + 635D668822C24F0C00A5BC9F /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 635D668722C24F0C00A5BC9F /* Starscream */; }; + 635D668A22C24FA300A5BC9F /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 635D668922C24FA300A5BC9F /* Starscream */; }; + 635D668C22C24FAE00A5BC9F /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 635D668B22C24FAE00A5BC9F /* Starscream */; }; + 635D668E22C2501E00A5BC9F /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 635D668D22C2501E00A5BC9F /* Starscream */; }; 635E0DD4204D915F00B1123A /* LinesAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DED67F204D8D60001554AC /* LinesAPITests.swift */; }; 635E0DD5204D915F00B1123A /* UsersAPITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DED67E204D8D60001554AC /* UsersAPITests.swift */; }; 635E0DD6204D915F00B1123A /* LineModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63DED66C204D8D60001554AC /* LineModelTests.swift */; }; @@ -369,7 +369,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6320D868204D81A70041FFAC /* Starscream.framework in Frameworks */, + 635D668822C24F0C00A5BC9F /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -385,7 +385,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6352070A204D7A55008C8C54 /* Starscream.framework in Frameworks */, + 635D668A22C24FA300A5BC9F /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -393,7 +393,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6352070C204D7A64008C8C54 /* Starscream.framework in Frameworks */, + 635D668C22C24FAE00A5BC9F /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -401,7 +401,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6352070E204D7A6B008C8C54 /* Starscream.framework in Frameworks */, + 635D668E22C2501E00A5BC9F /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -668,7 +668,6 @@ 6320D83B204D806D0041FFAC /* Frameworks */, 6320D83C204D806D0041FFAC /* Headers */, 6320D83D204D806D0041FFAC /* Resources */, - 6320D87D204D86BA0041FFAC /* Carthage */, 635E0E17204D942C00B1123A /* Swiftlint */, ); buildRules = ( @@ -676,6 +675,9 @@ dependencies = ( ); name = "QminderAPI-iOS"; + packageProductDependencies = ( + 635D668722C24F0C00A5BC9F /* Starscream */, + ); productName = QminderAPI; productReference = 6320D83F204D806D0041FFAC /* QminderAPI.framework */; productType = "com.apple.product-type.framework"; @@ -706,7 +708,6 @@ 63520686204D79E9008C8C54 /* Frameworks */, 63520687204D79E9008C8C54 /* Headers */, 63520688204D79E9008C8C54 /* Resources */, - 63DED698204D8F74001554AC /* Carthage */, 635E0E18204D945B00B1123A /* Swiftlint */, ); buildRules = ( @@ -714,6 +715,9 @@ dependencies = ( ); name = "QminderAPI-tvOS"; + packageProductDependencies = ( + 635D668922C24FA300A5BC9F /* Starscream */, + ); productName = "QminderAPI-tvOS"; productReference = 6352068A204D79E9008C8C54 /* QminderAPI.framework */; productType = "com.apple.product-type.framework"; @@ -726,7 +730,6 @@ 63520693204D7A00008C8C54 /* Frameworks */, 63520694204D7A00008C8C54 /* Headers */, 63520695204D7A00008C8C54 /* Resources */, - 63DED699204D8F86001554AC /* Carthage */, 635E0E19204D952900B1123A /* Swiftlint */, ); buildRules = ( @@ -734,6 +737,9 @@ dependencies = ( ); name = "QminderAPI-macOS"; + packageProductDependencies = ( + 635D668B22C24FAE00A5BC9F /* Starscream */, + ); productName = "QminderAPI-macOS"; productReference = 63520697204D7A00008C8C54 /* QminderAPI.framework */; productType = "com.apple.product-type.framework"; @@ -746,7 +752,6 @@ 635206A0204D7A10008C8C54 /* Frameworks */, 635206A1204D7A10008C8C54 /* Headers */, 635206A2204D7A10008C8C54 /* Resources */, - 63DED69A204D8FBB001554AC /* Carthage */, 635E0E1A204D954C00B1123A /* Swiftlint */, ); buildRules = ( @@ -754,6 +759,9 @@ dependencies = ( ); name = "QminderAPI-watchOS"; + packageProductDependencies = ( + 635D668D22C2501E00A5BC9F /* Starscream */, + ); productName = "QminderAPI-watchOS"; productReference = 635206A4204D7A10008C8C54 /* QminderAPI.framework */; productType = "com.apple.product-type.framework"; @@ -821,6 +829,9 @@ en, ); mainGroup = 635205F1204D76C9008C8C54; + packageReferences = ( + 635D668622C24F0C00A5BC9F /* XCRemoteSwiftPackageReference "Starscream" */, + ); productRefGroup = 635205FC204D76C9008C8C54 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -882,21 +893,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 6320D87D204D86BA0041FFAC /* Carthage */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/iOS/Starscream.framework", - ); - name = Carthage; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks\n"; - }; 635E0E17204D942C00B1123A /* Swiftlint */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -953,51 +949,6 @@ shellPath = /bin/sh; shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi"; }; - 63DED698204D8F74001554AC /* Carthage */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/tvOS/Starscream.framework", - ); - name = Carthage; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks\n"; - }; - 63DED699204D8F86001554AC /* Carthage */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/Mac/Starscream.framework", - ); - name = Carthage; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks\n"; - }; - 63DED69A204D8FBB001554AC /* Carthage */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/Carthage/Build/watchOS/Starscream.framework", - ); - name = Carthage; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/usr/local/bin/carthage copy-frameworks\n"; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -1311,7 +1262,12 @@ ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; PRODUCT_NAME = QminderAPI; @@ -1337,7 +1293,12 @@ ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; PRODUCT_NAME = QminderAPI; @@ -1458,7 +1419,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 11.2; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1472,7 +1434,11 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = QminderAPITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1487,7 +1453,11 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = QminderAPITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1512,7 +1482,11 @@ ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; PRODUCT_NAME = QminderAPI; @@ -1541,7 +1515,11 @@ ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; PRODUCT_NAME = QminderAPI; @@ -1572,7 +1550,11 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; @@ -1602,7 +1584,11 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; @@ -1631,7 +1617,11 @@ ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; PRODUCT_NAME = QminderAPI; @@ -1661,7 +1651,11 @@ ); INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; PRODUCT_NAME = QminderAPI; @@ -1680,7 +1674,11 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = QminderAPITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1696,7 +1694,11 @@ CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = QminderAPITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPITests; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1773,6 +1775,40 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 635D668622C24F0C00A5BC9F /* XCRemoteSwiftPackageReference "Starscream" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/daltoniam/Starscream"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 3.1.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 635D668722C24F0C00A5BC9F /* Starscream */ = { + isa = XCSwiftPackageProductDependency; + package = 635D668622C24F0C00A5BC9F /* XCRemoteSwiftPackageReference "Starscream" */; + productName = Starscream; + }; + 635D668922C24FA300A5BC9F /* Starscream */ = { + isa = XCSwiftPackageProductDependency; + package = 635D668622C24F0C00A5BC9F /* XCRemoteSwiftPackageReference "Starscream" */; + productName = Starscream; + }; + 635D668B22C24FAE00A5BC9F /* Starscream */ = { + isa = XCSwiftPackageProductDependency; + package = 635D668622C24F0C00A5BC9F /* XCRemoteSwiftPackageReference "Starscream" */; + productName = Starscream; + }; + 635D668D22C2501E00A5BC9F /* Starscream */ = { + isa = XCSwiftPackageProductDependency; + package = 635D668622C24F0C00A5BC9F /* XCRemoteSwiftPackageReference "Starscream" */; + productName = Starscream; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 635205F2204D76C9008C8C54 /* Project object */; } diff --git a/QminderAPI.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/QminderAPI.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 0da61e6..919434a 100644 --- a/QminderAPI.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/QminderAPI.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/QminderAPI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/QminderAPI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..6f383f4 --- /dev/null +++ b/QminderAPI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "Starscream", + "repositoryURL": "https://github.com/daltoniam/Starscream", + "state": { + "branch": null, + "revision": "9c03ef715d1bc9334b446c90df53586dd38cf849", + "version": "3.1.0" + } + } + ] + }, + "version": 1 +} diff --git a/QminderAPI.xcodeproj/xcshareddata/xcschemes/QminderAPI-iOS.xcscheme b/QminderAPI.xcodeproj/xcshareddata/xcschemes/QminderAPI-iOS.xcscheme index 2fb4c6f..22987f3 100644 --- a/QminderAPI.xcodeproj/xcshareddata/xcschemes/QminderAPI-iOS.xcscheme +++ b/QminderAPI.xcodeproj/xcshareddata/xcschemes/QminderAPI-iOS.xcscheme @@ -26,8 +26,17 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - codeCoverageEnabled = "YES" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> + + + + - - - - - - - - Date: Wed, 24 Jul 2019 14:58:28 +0300 Subject: [PATCH 02/12] Remove Carthage things --- .circleci/config.yml | 10 ---------- Example/.gitignore | 7 ------- scripts/bootstrap-if-needed.sh | 12 ------------ scripts/bootstrap.sh | 5 ----- scripts/copy-carthage-frameworks.sh | 23 ----------------------- 5 files changed, 57 deletions(-) delete mode 100755 scripts/bootstrap-if-needed.sh delete mode 100755 scripts/bootstrap.sh delete mode 100755 scripts/copy-carthage-frameworks.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 36a9a1c..c7933a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,12 +11,6 @@ jobs: - v2-dep-{{ .Branch }}- - v2-dep-master- - v2-dep- - - run: - name: Carthage - command: | - brew update - brew outdated carthage || brew upgrade carthage - scripts/bootstrap-if-needed.sh - run: name: Install Swiftlint @@ -73,10 +67,6 @@ jobs: - run: name: Pod lib lint command: pod lib lint --allow-warnings - - save_cache: - key: v2-dep-{{ .Branch }}-{{ epoch }} - paths: - - Carthage workflows: version: 2 nightly: diff --git a/Example/.gitignore b/Example/.gitignore index cab8c69..ddb5b2a 100644 --- a/Example/.gitignore +++ b/Example/.gitignore @@ -45,13 +45,6 @@ playground.xcworkspace # # Pods/ -# Carthage -# -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build - # fastlane # # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the diff --git a/scripts/bootstrap-if-needed.sh b/scripts/bootstrap-if-needed.sh deleted file mode 100755 index 7069a54..0000000 --- a/scripts/bootstrap-if-needed.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -RED='\033[1;31m' -GREEN='\033[1;32m' -NC='\033[0m' - -if ! cmp -s Cartfile.resolved Carthage/Cartfile.resolved; then - printf "${RED}Dependencies out of date with cache.${NC} Bootstrapping...\n" - scripts/bootstrap.sh -else - printf "${GREEN}Cache up-to-date.${NC} Skipping bootstrap...\n" -fi diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh deleted file mode 100755 index 036152d..0000000 --- a/scripts/bootstrap.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -carthage bootstrap - -cp Cartfile.resolved Carthage diff --git a/scripts/copy-carthage-frameworks.sh b/scripts/copy-carthage-frameworks.sh deleted file mode 100755 index dc14df0..0000000 --- a/scripts/copy-carthage-frameworks.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -case "$PLATFORM_NAME" in - macosx) plat=Mac;; - iphone*) plat=iOS;; - watch*) plat=watchOS;; - appletv*) plat=tvOS;; - *) echo "error: Unknown PLATFORM_NAME: $PLATFORM_NAME"; exit 1;; -esac - -for (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do - VAR=SCRIPT_INPUT_FILE_$n - framework=$(basename "${!VAR}") - export SCRIPT_INPUT_FILE_$n="$SRCROOT"/Carthage/Build/$plat/"$framework" -done - -/usr/local/bin/carthage copy-frameworks || exit - -for (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do - VAR=SCRIPT_INPUT_FILE_$n - source=${!VAR}.dSYM - dest=${BUILT_PRODUCTS_DIR}/$(basename "$source") - ditto "$source" "$dest" || exit From 01a0931b98597907d5b336cff4fd7f9c93ab105f Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Wed, 24 Jul 2019 14:58:34 +0300 Subject: [PATCH 03/12] Remove Carthage --- .gitignore | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6cbf977..50a0957 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,6 @@ DerivedData # Bundler .bundle -Carthage # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control @@ -57,20 +56,6 @@ DerivedData/ # End of https://www.gitignore.io/api/vapor - -# Created by https://www.gitignore.io/api/carthage - -### Carthage ### -# Carthage -# -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build - - -# End of https://www.gitignore.io/api/carthage - # fastlane fastlane/report.xml /fastlane/test_output/report.html From 2ef84bb3afb31cf6d31e7355d898baa387489bd5 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 25 Jul 2019 09:11:47 +0300 Subject: [PATCH 04/12] Fixed with new Xcode --- QminderAPI.xcodeproj/project.pbxproj | 45 +++++++--------------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/QminderAPI.xcodeproj/project.pbxproj b/QminderAPI.xcodeproj/project.pbxproj index 4c2ede3..8765fe9 100644 --- a/QminderAPI.xcodeproj/project.pbxproj +++ b/QminderAPI.xcodeproj/project.pbxproj @@ -827,6 +827,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 635205F1204D76C9008C8C54; packageReferences = ( @@ -1256,17 +1257,13 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", - "$(PROJECT_DIR)/Carthage/Build/iOS", ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; @@ -1287,17 +1284,13 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", - "$(PROJECT_DIR)/Carthage/Build/iOS", ); PRODUCT_BUNDLE_IDENTIFIER = com.qminder.QminderAPI; PRODUCT_MODULE_NAME = QminderAPI; @@ -1360,6 +1353,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.2; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1417,6 +1411,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.2; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -1476,10 +1471,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( @@ -1509,10 +1501,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/tvOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( @@ -1543,10 +1532,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1577,10 +1563,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; FRAMEWORK_VERSION = A; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1611,10 +1594,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/watchOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( @@ -1645,10 +1625,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/watchOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( From cb658fabffcf5a23d251364746750a83c856ffc2 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 25 Jul 2019 09:27:10 +0300 Subject: [PATCH 05/12] Use newer iPhone --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 8c43004..719facb 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -12,7 +12,7 @@ platform :ios do scheme: "QminderAPI-iOS", xcargs: "CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO", clean: true, - devices: ["iPhone X"] + devices: ["iPhone Xs"] ) # tvOS From 65f0999c64d8edf8305868e30594858634c79784 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 25 Jul 2019 09:29:24 +0300 Subject: [PATCH 06/12] Use iPhone x --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7933a4..36dcdc9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: swift build .build/debug/TestWebsockets& cd .. - set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone X' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color + set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone Xs' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color - run: From 610c3fe4a2829ddca789bd258941be653eb321ff Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 25 Jul 2019 09:35:36 +0300 Subject: [PATCH 07/12] Specify iOS 13 as os --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 36dcdc9..dc476e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: swift build .build/debug/TestWebsockets& cd .. - set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone Xs' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color + set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone Xs,os=13.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color - run: From 113dc8b2af6b006eea10d905ce1ee0fb409acd05 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 25 Jul 2019 09:44:37 +0300 Subject: [PATCH 08/12] Specify OS version correctly --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dc476e8..4cb2dcb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: swift build .build/debug/TestWebsockets& cd .. - set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone Xs,os=13.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color + set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone Xs,OS=13.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color - run: From ebff295564981d10d98f6abd54240072df54c436 Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 25 Jul 2019 11:56:47 +0300 Subject: [PATCH 09/12] Specify OS also for TV --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cb2dcb..ef90299 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: .build/debug/TestWebsockets& cd .. set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-iOS -destination 'platform=iOS Simulator,name=iPhone Xs,OS=13.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color - set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color + set -o pipefail && xcodebuild -project QminderAPI.xcodeproj -scheme QminderAPI-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=13.0' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -enableCodeCoverage YES clean test build | xcpretty --color - run: name: Codeconv From e72153f0b077741b2eb8c90c98c33cb6a3d6c05f Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Thu, 25 Jul 2019 17:13:47 +0300 Subject: [PATCH 10/12] Disable documentation generation --- .circleci/config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef90299..de14e53 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,17 +56,17 @@ jobs: pod update xcodebuild clean build -workspace QminderTVApp.xcworkspace -scheme QminderTVApp CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED="NO" - - run: - name: Check code coverage - command: | - brew install jq - sudo gem install atomos --no-document - sudo gem install jazzy --no-document - jazzy - ./documentation-coverage.sh - - run: - name: Pod lib lint - command: pod lib lint --allow-warnings + # - run: + # name: Check code coverage + # command: | + # brew install jq + # sudo gem install atomos --no-document + # sudo gem install jazzy --no-document + # jazzy + # ./documentation-coverage.sh + # - run: + # name: Pod lib lint + # command: pod lib lint --allow-warnings workflows: version: 2 nightly: From 4e76eb724ca7bd1d4e507ae96d8be95ea7d58e3d Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Mon, 16 Sep 2019 17:11:50 +0300 Subject: [PATCH 11/12] Remove CircleCI badge --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 960559a..428ccf5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Qminder Swift API -[![CircleCI](https://circleci.com/gh/Qminder/swift-api.svg?style=svg)](https://circleci.com/gh/Qminder/swift-api) [![Version](https://img.shields.io/cocoapods/v/QminderAPI.svg?style=flat)](http://cocoapods.org/pods/QminderAPI) [![License](https://img.shields.io/cocoapods/l/QminderAPI.svg?style=flat)](http://cocoapods.org/pods/QminderAPI) [![Platform](https://img.shields.io/cocoapods/p/QminderAPI.svg?style=flat)](http://cocoapods.org/pods/QminderAPI) From 32687acaa189ab1221ec0cb658c714362318fe9e Mon Sep 17 00:00:00 2001 From: Kristaps Grinbergs Date: Mon, 16 Sep 2019 17:18:53 +0300 Subject: [PATCH 12/12] Update Swift version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 428ccf5..657163f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Version](https://img.shields.io/cocoapods/v/QminderAPI.svg?style=flat)](http://cocoapods.org/pods/QminderAPI) [![License](https://img.shields.io/cocoapods/l/QminderAPI.svg?style=flat)](http://cocoapods.org/pods/QminderAPI) [![Platform](https://img.shields.io/cocoapods/p/QminderAPI.svg?style=flat)](http://cocoapods.org/pods/QminderAPI) -![Swift](https://img.shields.io/badge/%20in-swift%204.2-orange.svg) +![Swift](https://img.shields.io/badge/%20in-swift%205.1-orange.svg) [![codecov](https://codecov.io/gh/Qminder/swift-api/branch/master/graph/badge.svg)](https://codecov.io/gh/Qminder/swift-api) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Swift Package Manager compatible](https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)