diff --git a/Exemple/OpenSourceControllerDemo.xcodeproj/project.pbxproj b/Exemple/OpenSourceControllerDemo.xcodeproj/project.pbxproj index d6925a9..311cded 100644 --- a/Exemple/OpenSourceControllerDemo.xcodeproj/project.pbxproj +++ b/Exemple/OpenSourceControllerDemo.xcodeproj/project.pbxproj @@ -123,13 +123,13 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = OpenSourceController; TargetAttributes = { 76EAA8601E93F2CC009A41DA = { CreatedOnToolsVersion = 8.3; DevelopmentTeam = 62PP362QNQ; - LastSwiftMigration = 0900; + LastSwiftMigration = 1000; ProvisioningStyle = Automatic; }; }; @@ -219,6 +219,7 @@ 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_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -226,6 +227,7 @@ 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; @@ -277,6 +279,7 @@ 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_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -284,6 +287,7 @@ 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; @@ -323,8 +327,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.fg.OpenSourceControllerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -337,8 +340,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.fg.OpenSourceControllerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Exemple/OpenSourceControllerDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + 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 a41860a..0c84e87 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 a244daa..01c4838 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 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/OpenSourceController.xcodeproj/project.pbxproj b/OpenSourceController.xcodeproj/project.pbxproj index ea3b6e3..e70bbd3 100644 --- a/OpenSourceController.xcodeproj/project.pbxproj +++ b/OpenSourceController.xcodeproj/project.pbxproj @@ -205,15 +205,18 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = OpenSourceController; TargetAttributes = { 52D6D97B1BEFF229002C0205 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0830; + DevelopmentTeam = 62PP362QNQ; + LastSwiftMigration = 1000; + ProvisioningStyle = Automatic; }; 52D6D9851BEFF229002C0205 = { CreatedOnToolsVersion = 7.1; + DevelopmentTeam = 62PP362QNQ; LastSwiftMigration = ""; }; }; @@ -298,12 +301,14 @@ 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; @@ -355,12 +360,14 @@ 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; @@ -398,8 +405,11 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 62PP362QNQ; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -410,9 +420,10 @@ ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.OpenSourceController.OpenSourceController-iOS"; PRODUCT_NAME = OpenSourceController; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -421,8 +432,11 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 62PP362QNQ; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -432,9 +446,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.OpenSourceController.OpenSourceController-iOS"; PRODUCT_NAME = OpenSourceController; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -443,6 +458,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; + DEVELOPMENT_TEAM = 62PP362QNQ; INFOPLIST_FILE = Configs/OpenSourceControllerTests.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.OpenSourceController.OpenSourceController-iOS-Tests"; @@ -457,6 +473,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; + DEVELOPMENT_TEAM = 62PP362QNQ; INFOPLIST_FILE = Configs/OpenSourceControllerTests.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.OpenSourceController.OpenSourceController-iOS-Tests"; diff --git a/OpenSourceController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OpenSourceController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/OpenSourceController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/OpenSourceController.xcodeproj/project.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate b/OpenSourceController.xcodeproj/project.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate index ba0106f..3fdb701 100644 Binary files a/OpenSourceController.xcodeproj/project.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate and b/OpenSourceController.xcodeproj/project.xcworkspace/xcuserdata/floriangabach.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-iOS.xcscheme b/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-iOS.xcscheme index 1dfdc38..2f13031 100644 --- a/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-iOS.xcscheme +++ b/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-iOS.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -57,7 +56,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-macOS.xcscheme b/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-macOS.xcscheme index 8a79f9c..bd76d47 100644 --- a/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-macOS.xcscheme +++ b/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-macOS.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -57,7 +56,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-tvOS.xcscheme b/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-tvOS.xcscheme index b70ed63..21b45a6 100644 --- a/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-tvOS.xcscheme +++ b/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-tvOS.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -57,7 +56,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-watchOS.xcscheme b/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-watchOS.xcscheme index 6a900ab..97f4534 100644 --- a/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-watchOS.xcscheme +++ b/OpenSourceController.xcodeproj/xcshareddata/xcschemes/OpenSourceController-watchOS.xcscheme @@ -1,6 +1,6 @@ + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -38,7 +37,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/Sources/Controller/OpenSourceViewController.swift b/Sources/Controller/OpenSourceViewController.swift index 2bd1b0f..619577b 100644 --- a/Sources/Controller/OpenSourceViewController.swift +++ b/Sources/Controller/OpenSourceViewController.swift @@ -16,7 +16,7 @@ class OpenSourceViewController: UITableViewController { y: 0, width: 40, height: 40) ) - indicator.activityIndicatorViewStyle = UIActivityIndicatorViewStyle.gray + indicator.style = UIActivityIndicatorView.Style.gray indicator.hidesWhenStopped = true indicator.backgroundColor = UIColor.clear indicator.color = UIColor.black @@ -115,7 +115,7 @@ class OpenSourceViewController: UITableViewController { // Applu navigation bar text color if needed if let textColor = self.config.uiConfig.titleColor { - let attribut = [NSAttributedStringKey.foregroundColor: textColor] + let attribut = [NSAttributedString.Key.foregroundColor: textColor] self.navigationController?.navigationBar.titleTextAttributes = attribut } } @@ -177,7 +177,7 @@ class OpenSourceViewController: UITableViewController { for: indexPath) as? OpenSourceTableViewCell // Init cell if cell == nil { - cell = OpenSourceTableViewCell(style: UITableViewCellStyle.default, + cell = OpenSourceTableViewCell(style: UITableViewCell.CellStyle.default, reuseIdentifier: self.reuseIdentifier) } @@ -191,7 +191,7 @@ class OpenSourceViewController: UITableViewController { override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat { // Automatic dimension - return UITableViewAutomaticDimension + return UITableView.automaticDimension } // MARK: - Action diff --git a/Sources/View/OpenSourceTableViewCell.swift b/Sources/View/OpenSourceTableViewCell.swift index 42a6457..9a91746 100644 --- a/Sources/View/OpenSourceTableViewCell.swift +++ b/Sources/View/OpenSourceTableViewCell.swift @@ -10,7 +10,7 @@ class OpenSourceTableViewCell: UITableViewCell { // MARK: - Lifecycle - override init(style: UITableViewCellStyle, reuseIdentifier: String?) { + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: .default, reuseIdentifier: reuseIdentifier) @@ -41,8 +41,8 @@ class OpenSourceTableViewCell: UITableViewCell { func configure(licence: LicenceFile, config: OpenSourceControllerConfig) { // Build attributed text - let libraryTitleAttribut = [NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize + 2)] - let libraryLicenceAttribut = [NSAttributedStringKey.font: UIFont.systemFont(ofSize: UIFont.systemFontSize)] + let libraryTitleAttribut = [NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize + 2)] + let libraryLicenceAttribut = [NSAttributedString.Key.font: UIFont.systemFont(ofSize: UIFont.systemFontSize)] let libraryTitle = NSMutableAttributedString(string: licence.title ?? "", attributes: libraryTitleAttribut) libraryTitle.append(NSAttributedString(string: "\n\n"))