Merge pull request ChatSecure#1197 from ChatSecure/5.0.2-updates

5.0.2 Updates
fengjixuchui · Mar 27, 2020 · 0f516da · 0f516da
2 parents 03b6a74 + 1e91f06
commit 0f516da
Show file tree

Hide file tree

Showing 58 changed files with 404 additions and 495 deletions.
diff --git a/ChatSecure.xcodeproj/project.pbxproj b/ChatSecure.xcodeproj/project.pbxproj
@@ -2567,7 +2567,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $CONFIGURATION = \"Debug\" ]; then\n${PODS_ROOT}/LicensePlist/license-plist --output-path $PRODUCT_NAME/Settings.bundle --add-version-numbers --suppress-opening-directory || true\nfi\n";
+			shellScript = "${PODS_ROOT}/LicensePlist/license-plist --output-path $PRODUCT_NAME/Settings.bundle --add-version-numbers --suppress-opening-directory || true\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -3112,8 +3112,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
-				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
+				CURRENT_PROJECT_VERSION = 163;
+				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -3128,7 +3128,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.0.1;
+				MARKETING_VERSION = 5.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -3150,8 +3150,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
-				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
+				CURRENT_PROJECT_VERSION = 163;
+				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -3166,7 +3166,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.0.1;
+				MARKETING_VERSION = 5.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -3296,8 +3296,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
-				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
+				CURRENT_PROJECT_VERSION = 163;
+				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -3312,7 +3312,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.0.1;
+				MARKETING_VERSION = 5.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -3486,8 +3486,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 160;
-				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
+				CURRENT_PROJECT_VERSION = 163;
+				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -3502,7 +3502,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.0.1;
+				MARKETING_VERSION = 5.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

diff --git a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure (Mac).xcscheme b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure (Mac).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureUITests.xcscheme b/ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt b/ChatSecure/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt
@@ -11,16 +11,16 @@ body: Copyright (c) 2011-2…
 version: 3.2.1
 
 name: Alamofire, nameSpecified: 
-body: Copyright (c) 2014 A…
-version: 4.9.0
+body: Copyright (c) 2014-2…
+version: 5.0.5
 
 name: Alamofire, nameSpecified: 
-body: Copyright (c) 2014 A…
-version: 4.9.0
+body: Copyright (c) 2014-2…
+version: 5.0.5
 
 name: Alamofire, nameSpecified: 
-body: Copyright (c) 2014 A…
-version: 4.9.0
+body: Copyright (c) 2014-2…
+version: 5.0.5
 
 name: ARChromeActivity, nameSpecified: 
 body: ARChromeActivity
@@ -87,39 +87,27 @@ version: 0.1.0
 
 name: CocoaAsyncSocket, nameSpecified: 
 body: Public Domain Licens…
-version: 7.6.3
+version: 7.6.4
 
 name: CocoaAsyncSocket, nameSpecified: 
 body: Public Domain Licens…
-version: 7.6.3
+version: 7.6.4
 
 name: CocoaAsyncSocket, nameSpecified: 
 body: Public Domain Licens…
-version: 7.6.3
+version: 7.6.4
 
 name: CocoaLumberjack, nameSpecified: 
 body: BSD 3-Clause License…
-version: 3.6.0
+version: 3.6.1
 
 name: CocoaLumberjack, nameSpecified: 
 body: BSD 3-Clause License…
-version: 3.6.0
+version: 3.6.1
 
 name: CocoaLumberjack, nameSpecified: 
 body: BSD 3-Clause License…
-version: 3.6.0
-
-name: CPAProxy, nameSpecified: 
-body: Copyright (c) 2013 C…
-version: 2.0.0
-
-name: CPAProxy, nameSpecified: 
-body: Copyright (c) 2013 C…
-version: 2.0.0
-
-name: CPAProxy, nameSpecified: 
-body: Copyright (c) 2013 C…
-version: 2.0.0
+version: 3.6.1
 
 name: DTFoundation, nameSpecified: 
 body: Copyright (c) 2011, …
@@ -147,27 +135,27 @@ version: 1.9.0
 
 name: GCDWebServer, nameSpecified: 
 body: Copyright (c) 2012-2…
-version: 3.5.3
+version: 3.5.4
 
 name: GCDWebServer, nameSpecified: 
 body: Copyright (c) 2012-2…
-version: 3.5.3
+version: 3.5.4
 
 name: GCDWebServer, nameSpecified: 
 body: Copyright (c) 2012-2…
-version: 3.5.3
+version: 3.5.4
 
 name: HTMLReader, nameSpecified: 
 body: HTMLReader is in the…
-version: 2.1.4
+version: 2.1.5
 
 name: HTMLReader, nameSpecified: 
 body: HTMLReader is in the…
-version: 2.1.4
+version: 2.1.5
 
 name: HTMLReader, nameSpecified: 
 body: HTMLReader is in the…
-version: 2.1.4
+version: 2.1.5
 
 name: IOCipher, nameSpecified: 
 body: 		  GNU LESSER GENER…
@@ -213,15 +201,15 @@ version: 1.5.1
 
 name: KissXML, nameSpecified: 
 body: Copyright (c) 2012, …
-version: 5.2.3
+version: 5.3.1
 
 name: KissXML, nameSpecified: 
 body: Copyright (c) 2012, …
-version: 5.2.3
+version: 5.3.1
 
 name: KissXML, nameSpecified: 
 body: Copyright (c) 2012, …
-version: 5.2.3
+version: 5.3.1
 
 name: Kvitto, nameSpecified: 
 body: Copyright (c) 2015, …
@@ -287,19 +275,19 @@ name: LicensePlist, nameSpecified:
 body: MIT License
 
 Copyrig…
-version: 2.8.1
+version: 2.14.0
 
 name: LicensePlist, nameSpecified: 
 body: MIT License
 
 Copyrig…
-version: 2.8.1
+version: 2.14.0
 
 name: LicensePlist, nameSpecified: 
 body: MIT License
 
 Copyrig…
-version: 2.8.1
+version: 2.14.0
 
 name: LumberjackConsole, nameSpecified: 
 body: Apache License
@@ -318,27 +306,27 @@ version: 3.3.1
 
 name: Mantle, nameSpecified: 
 body: **Copyright (c) GitH…
-version: 2.1.0
+version: 2.1.1
 
 name: Mantle, nameSpecified: 
 body: **Copyright (c) GitH…
-version: 2.1.0
+version: 2.1.1
 
 name: Mantle, nameSpecified: 
 body: **Copyright (c) GitH…
-version: 2.1.0
+version: 2.1.1
 
 name: MBProgressHUD, nameSpecified: 
-body: Copyright © 2009-201…
-version: 1.1.0
+body: Copyright © 2009-202…
+version: 1.2.0
 
 name: MBProgressHUD, nameSpecified: 
-body: Copyright © 2009-201…
-version: 1.1.0
+body: Copyright © 2009-202…
+version: 1.2.0
 
 name: MBProgressHUD, nameSpecified: 
-body: Copyright © 2009-201…
-version: 1.1.0
+body: Copyright © 2009-202…
+version: 1.2.0
 
 name: MWFeedParser, nameSpecified: 
 body: Copyright (c) 2010 M…
@@ -477,15 +465,15 @@ version: 1.1.0
 
 name: SQLCipher, nameSpecified: 
 body: Copyright (c) 2008, …
-version: 4.2.0
+version: 4.3.0
 
 name: SQLCipher, nameSpecified: 
 body: Copyright (c) 2008, …
-version: 4.2.0
+version: 4.3.0
 
 name: SQLCipher, nameSpecified: 
 body: Copyright (c) 2008, …
-version: 4.2.0
+version: 4.3.0
 
 name: TTTAttributedLabel, nameSpecified: 
 body: Copyright (c) 2011 M…
@@ -525,15 +513,15 @@ version: 4.1.0
 
 name: YapDatabase, nameSpecified: 
 body: Software License Agr…
-version: 3.1.4
+version: 4.0
 
 name: YapDatabase, nameSpecified: 
 body: Software License Agr…
-version: 3.1.4
+version: 4.0
 
 name: YapDatabase, nameSpecified: 
 body: Software License Agr…
-version: 3.1.4
+version: 4.0
 
 name: YapTaskQueue, nameSpecified: 
 body: This is free and une…
@@ -583,4 +571,4 @@ body: This file contains t…
 
 add-version-numbers: true
 
-LicensePlist Version: 2.8.0
+LicensePlist Version: 2.14.0