From 05de599739b4182dfbdfdd2740eff219ae3ab742 Mon Sep 17 00:00:00 2001 From: Lyubo Marinov Date: Tue, 19 Dec 2017 13:17:00 -0600 Subject: [PATCH] [iOS] Update projects to Xcode recommended settings --- ios/app/app.xcodeproj/project.pbxproj | 14 ++- .../xcschemes/jitsi-meet.xcscheme | 4 +- .../AppIconDebug.appiconset/Contents.json | 101 +++++++++--------- .../AppIconRelease.appiconset/Contents.json | 101 +++++++++--------- ios/sdk/sdk.xcodeproj/project.pbxproj | 18 +++- .../xcshareddata/xcschemes/JitsiMeet.xcscheme | 6 +- 6 files changed, 141 insertions(+), 103 deletions(-) diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index 1a6fcd70eb..9a1342dd2b 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -138,7 +138,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = Facebook; TargetAttributes = { 13B07F861A680F5B00A75B9A = { @@ -321,14 +321,20 @@ 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_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_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; @@ -371,14 +377,20 @@ 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_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_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; diff --git a/ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme b/ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme index f5f6dd920c..b6a8ae73e9 100644 --- a/ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme +++ b/ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme @@ -1,6 +1,6 @@ @@ -59,6 +60,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ios/app/src/Images.xcassets/AppIconDebug.appiconset/Contents.json b/ios/app/src/Images.xcassets/AppIconDebug.appiconset/Contents.json index e8493842d0..5f6e7fb147 100644 --- a/ios/app/src/Images.xcassets/AppIconDebug.appiconset/Contents.json +++ b/ios/app/src/Images.xcassets/AppIconDebug.appiconset/Contents.json @@ -2,103 +2,108 @@ "images" : [ { "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" + "size" : "20x20", + "scale" : "2x" }, { "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" + "size" : "20x20", + "scale" : "3x" }, { - "filename" : "AppIcon-29@2x.png", + "size" : "29x29", "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" + "filename" : "AppIcon-29@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-29@3x.png", + "size" : "29x29", "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" + "filename" : "AppIcon-29@3x.png", + "scale" : "3x" }, { - "filename" : "AppIcon-40@2x.png", + "size" : "40x40", "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" + "filename" : "AppIcon-40@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-60@2x.png", + "size" : "40x40", "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" + "filename" : "AppIcon-60@2x.png", + "scale" : "3x" }, { - "filename" : "AppIcon-60@2x.png", + "size" : "60x60", "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" + "filename" : "AppIcon-60@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-60@3x.png", + "size" : "60x60", "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" + "filename" : "AppIcon-60@3x.png", + "scale" : "3x" }, { "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" + "size" : "20x20", + "scale" : "1x" }, { "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" + "size" : "20x20", + "scale" : "2x" }, { "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" + "size" : "29x29", + "scale" : "1x" }, { - "filename" : "AppIcon-29@2x.png", + "size" : "29x29", "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" + "filename" : "AppIcon-29@2x.png", + "scale" : "2x" }, { "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" + "size" : "40x40", + "scale" : "1x" }, { - "filename" : "AppIcon-40@2x.png", + "size" : "40x40", "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" + "filename" : "AppIcon-40@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-76@1x.png", + "size" : "76x76", "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" + "filename" : "AppIcon-76@1x.png", + "scale" : "1x" }, { - "filename" : "AppIcon-76@2x.png", + "size" : "76x76", "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" + "filename" : "AppIcon-76@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-83.5@2x.png", + "size" : "83.5x83.5", "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" + "filename" : "AppIcon-83.5@2x.png", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" } -} +} \ No newline at end of file diff --git a/ios/app/src/Images.xcassets/AppIconRelease.appiconset/Contents.json b/ios/app/src/Images.xcassets/AppIconRelease.appiconset/Contents.json index e8493842d0..5f6e7fb147 100644 --- a/ios/app/src/Images.xcassets/AppIconRelease.appiconset/Contents.json +++ b/ios/app/src/Images.xcassets/AppIconRelease.appiconset/Contents.json @@ -2,103 +2,108 @@ "images" : [ { "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" + "size" : "20x20", + "scale" : "2x" }, { "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" + "size" : "20x20", + "scale" : "3x" }, { - "filename" : "AppIcon-29@2x.png", + "size" : "29x29", "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" + "filename" : "AppIcon-29@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-29@3x.png", + "size" : "29x29", "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" + "filename" : "AppIcon-29@3x.png", + "scale" : "3x" }, { - "filename" : "AppIcon-40@2x.png", + "size" : "40x40", "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" + "filename" : "AppIcon-40@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-60@2x.png", + "size" : "40x40", "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" + "filename" : "AppIcon-60@2x.png", + "scale" : "3x" }, { - "filename" : "AppIcon-60@2x.png", + "size" : "60x60", "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" + "filename" : "AppIcon-60@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-60@3x.png", + "size" : "60x60", "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" + "filename" : "AppIcon-60@3x.png", + "scale" : "3x" }, { "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" + "size" : "20x20", + "scale" : "1x" }, { "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" + "size" : "20x20", + "scale" : "2x" }, { "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" + "size" : "29x29", + "scale" : "1x" }, { - "filename" : "AppIcon-29@2x.png", + "size" : "29x29", "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" + "filename" : "AppIcon-29@2x.png", + "scale" : "2x" }, { "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" + "size" : "40x40", + "scale" : "1x" }, { - "filename" : "AppIcon-40@2x.png", + "size" : "40x40", "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" + "filename" : "AppIcon-40@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-76@1x.png", + "size" : "76x76", "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" + "filename" : "AppIcon-76@1x.png", + "scale" : "1x" }, { - "filename" : "AppIcon-76@2x.png", + "size" : "76x76", "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" + "filename" : "AppIcon-76@2x.png", + "scale" : "2x" }, { - "filename" : "AppIcon-83.5@2x.png", + "size" : "83.5x83.5", "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" + "filename" : "AppIcon-83.5@2x.png", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" } -} +} \ No newline at end of file diff --git a/ios/sdk/sdk.xcodeproj/project.pbxproj b/ios/sdk/sdk.xcodeproj/project.pbxproj index 798980acc3..8cb97b7d06 100644 --- a/ios/sdk/sdk.xcodeproj/project.pbxproj +++ b/ios/sdk/sdk.xcodeproj/project.pbxproj @@ -184,7 +184,7 @@ 0BD906DC1EC0C00300C8C18E /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = Jitsi; TargetAttributes = { 0BD906E41EC0C00300C8C18E = { @@ -315,7 +315,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; @@ -323,7 +325,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; @@ -368,7 +374,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; @@ -376,7 +384,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; @@ -410,7 +422,7 @@ baseConfigurationReference = 98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; @@ -432,7 +444,7 @@ baseConfigurationReference = 9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; diff --git a/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme b/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme index 4d12d6a363..9319797a30 100644 --- a/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme +++ b/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme @@ -1,7 +1,7 @@ + LastUpgradeVersion = "0920" + version = "1.7"> @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO"