diff --git a/Exemple/OpenSourceControllerDemo.xcodeproj/project.pbxproj b/Exemple/OpenSourceControllerDemo.xcodeproj/project.pbxproj index d354f7d..8ea3ec8 100644 --- a/Exemple/OpenSourceControllerDemo.xcodeproj/project.pbxproj +++ b/Exemple/OpenSourceControllerDemo.xcodeproj/project.pbxproj @@ -120,12 +120,13 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = OpenSourceController; TargetAttributes = { 76EAA8601E93F2CC009A41DA = { CreatedOnToolsVersion = 8.3; DevelopmentTeam = 62PP362QNQ; + LastSwiftMigration = 0900; ProvisioningStyle = Automatic; }; }; @@ -210,7 +211,9 @@ 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -218,7 +221,11 @@ 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_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; @@ -261,7 +268,9 @@ 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -269,7 +278,11 @@ 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_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; @@ -304,7 +317,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.fg.OpenSourceControllerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -317,7 +331,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.fg.OpenSourceControllerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate b/Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate index ef1f585..c29cf97 100644 Binary files a/Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate and b/Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Exemple/OpenSourceControllerDemo.xcodeproj/xcuserdata/floriangabach.xcuserdatad/xcschemes/OpenSourceControllerDemo.xcscheme b/Exemple/OpenSourceControllerDemo.xcodeproj/xcuserdata/floriangabach.xcuserdatad/xcschemes/OpenSourceControllerDemo.xcscheme index 583bbcb..a244daa 100644 --- a/Exemple/OpenSourceControllerDemo.xcodeproj/xcuserdata/floriangabach.xcuserdatad/xcschemes/OpenSourceControllerDemo.xcscheme +++ b/Exemple/OpenSourceControllerDemo.xcodeproj/xcuserdata/floriangabach.xcuserdatad/xcschemes/OpenSourceControllerDemo.xcscheme @@ -1,6 +1,6 @@ Void) { + completion: @escaping () -> Void) { if let url = URL(string: self.url) { let task = URLSession.shared.dataTask(with: url) { (data, _, _) in if let data = data, diff --git a/Sources/View/OpenSourceTableViewCell.swift b/Sources/View/OpenSourceTableViewCell.swift index 6e93987..fa901b4 100644 --- a/Sources/View/OpenSourceTableViewCell.swift +++ b/Sources/View/OpenSourceTableViewCell.swift @@ -49,8 +49,8 @@ class OpenSourceTableViewCell: UITableViewCell { func configure(licence: LicenceFile, config: OpenSourceControllerConfig) { // Build attributed text - let libraryTitleAttribut = [NSFontAttributeName: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize + 2)] - let libraryLicenceAttribut = [NSFontAttributeName: UIFont.systemFont(ofSize: UIFont.systemFontSize)] + let libraryTitleAttribut = [NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize + 2)] + let libraryLicenceAttribut = [NSAttributedStringKey.font: UIFont.systemFont(ofSize: UIFont.systemFontSize)] let libraryTitle = NSMutableAttributedString(string: licence.title ?? "", attributes: libraryTitleAttribut) libraryTitle.append(NSAttributedString(string: "\n\n"))