Skip to content

Commit f8e26d1

Browse files
chrisballingerchrisballinger
committed
Fixing issues with Xcode 12
1 parent 21babb5 commit f8e26d1

File tree

13 files changed

+92
-96
lines changed

13 files changed

+92
-96
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.env
12
.DS_Store
23
build
34
*.mode1v3
@@ -16,3 +17,5 @@ com.mono0926.LicensePlist.Output/
1617
Secrets.plist
1718
Preview.html
1819
fastlane/report.xml
20+
fastlane/test_output/
21+
.ruby-version

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode11.3
1+
osx_image: xcode12
22
language: objective-c
33

44
# Handle git submodules yourself
@@ -9,7 +9,7 @@ git:
99
# Use sed to replace the SSH URL with the public URL, then initialize submodules
1010
before_install:
1111
# Fix Travis xcodebuild exited with 65 https://github.com/travis-ci/travis-ci/issues/6675#issuecomment-257964767
12-
- export IOS_SIMULATOR_UDID=`instruments -s devices | grep -m 1 "iPhone 8 (13" | awk -F '[ ]' '{print $4}' | awk -F '[\[]' '{print $2}' | sed 's/.$//'`
12+
- export IOS_SIMULATOR_UDID=`instruments -s devices | grep -m 1 "iPhone 8 (14" | awk -F '[ ]' '{print $4}' | awk -F '[\[]' '{print $2}' | sed 's/.$//'`
1313
- echo $IOS_SIMULATOR_UDID
1414
- bundle install # We need a pre-release CocoaPods version
1515
- sed -i -e 's/[email protected]:/git:\/\/github.com\//' .gitmodules

‎ChatSecure.xcodeproj/project.pbxproj

+13-9
Original file line numberDiff line numberDiff line change
@@ -2235,7 +2235,7 @@
22352235
CLASSPREFIX = OTR;
22362236
LastSwiftMigration = 0700;
22372237
LastSwiftUpdateCheck = 0820;
2238-
LastUpgradeCheck = 1110;
2238+
LastUpgradeCheck = 1200;
22392239
ORGANIZATIONNAME = "Chris Ballinger";
22402240
TargetAttributes = {
22412241
6365CEFB1E2453F6009E213F = {
@@ -3030,6 +3030,7 @@
30303030
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
30313031
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
30323032
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
3033+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
30333034
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
30343035
CLANG_WARN_STRICT_PROTOTYPES = NO;
30353036
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3095,6 +3096,7 @@
30953096
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
30963097
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
30973098
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
3099+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
30983100
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
30993101
CLANG_WARN_STRICT_PROTOTYPES = NO;
31003102
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3140,7 +3142,7 @@
31403142
CODE_SIGN_IDENTITY = "iPhone Developer";
31413143
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
31423144
CODE_SIGN_STYLE = Automatic;
3143-
CURRENT_PROJECT_VERSION = 167;
3145+
CURRENT_PROJECT_VERSION = 168;
31443146
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
31453147
DEVELOPMENT_TEAM = "";
31463148
ENABLE_HARDENED_RUNTIME = NO;
@@ -3156,7 +3158,7 @@
31563158
"$(inherited)",
31573159
"@executable_path/Frameworks",
31583160
);
3159-
MARKETING_VERSION = 5.0.2;
3161+
MARKETING_VERSION = 5.0.3;
31603162
PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
31613163
PRODUCT_NAME = "$(TARGET_NAME)";
31623164
PROVISIONING_PROFILE = "";
@@ -3178,7 +3180,7 @@
31783180
CODE_SIGN_IDENTITY = "iPhone Developer";
31793181
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
31803182
CODE_SIGN_STYLE = Automatic;
3181-
CURRENT_PROJECT_VERSION = 167;
3183+
CURRENT_PROJECT_VERSION = 168;
31823184
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
31833185
DEVELOPMENT_TEAM = "";
31843186
ENABLE_HARDENED_RUNTIME = YES;
@@ -3194,7 +3196,7 @@
31943196
"$(inherited)",
31953197
"@executable_path/Frameworks",
31963198
);
3197-
MARKETING_VERSION = 5.0.2;
3199+
MARKETING_VERSION = 5.0.3;
31983200
PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
31993201
PRODUCT_NAME = "$(TARGET_NAME)";
32003202
PROVISIONING_PROFILE = "";
@@ -3271,6 +3273,7 @@
32713273
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
32723274
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
32733275
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
3276+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
32743277
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
32753278
CLANG_WARN_STRICT_PROTOTYPES = NO;
32763279
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3324,7 +3327,7 @@
33243327
CODE_SIGN_IDENTITY = "iPhone Developer";
33253328
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
33263329
CODE_SIGN_STYLE = Automatic;
3327-
CURRENT_PROJECT_VERSION = 167;
3330+
CURRENT_PROJECT_VERSION = 168;
33283331
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
33293332
DEVELOPMENT_TEAM = "";
33303333
ENABLE_HARDENED_RUNTIME = NO;
@@ -3340,7 +3343,7 @@
33403343
"$(inherited)",
33413344
"@executable_path/Frameworks",
33423345
);
3343-
MARKETING_VERSION = 5.0.2;
3346+
MARKETING_VERSION = 5.0.3;
33443347
PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
33453348
PRODUCT_NAME = "$(TARGET_NAME)";
33463349
PROVISIONING_PROFILE = "";
@@ -3469,6 +3472,7 @@
34693472
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
34703473
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
34713474
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
3475+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
34723476
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
34733477
CLANG_WARN_STRICT_PROTOTYPES = NO;
34743478
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -3514,7 +3518,7 @@
35143518
CODE_SIGN_IDENTITY = "iPhone Developer";
35153519
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
35163520
CODE_SIGN_STYLE = Automatic;
3517-
CURRENT_PROJECT_VERSION = 167;
3521+
CURRENT_PROJECT_VERSION = 168;
35183522
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = NO;
35193523
DEVELOPMENT_TEAM = "";
35203524
ENABLE_HARDENED_RUNTIME = YES;
@@ -3530,7 +3534,7 @@
35303534
"$(inherited)",
35313535
"@executable_path/Frameworks",
35323536
);
3533-
MARKETING_VERSION = 5.0.2;
3537+
MARKETING_VERSION = 5.0.3;
35343538
PRODUCT_BUNDLE_IDENTIFIER = com.chrisballinger.ChatSecure;
35353539
PRODUCT_NAME = "$(TARGET_NAME)";
35363540
PROVISIONING_PROFILE = "";

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure (Mac).xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecure.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureCore.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureTests.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ChatSecure.xcodeproj/xcshareddata/xcschemes/ChatSecureUITests.xcscheme

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1140"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -12,15 +12,6 @@
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
1313
shouldUseLaunchSchemeArgsEnv = "YES"
1414
disableMainThreadChecker = "YES">
15-
<MacroExpansion>
16-
<BuildableReference
17-
BuildableIdentifier = "primary"
18-
BlueprintIdentifier = "6396AF991A169D54009F3E6C"
19-
BuildableName = "ChatSecure.app"
20-
BlueprintName = "ChatSecure"
21-
ReferencedContainer = "container:ChatSecure.xcodeproj">
22-
</BuildableReference>
23-
</MacroExpansion>
2415
<Testables>
2516
<TestableReference
2617
skipped = "NO">

‎ChatSecureCore/Classes/Controllers/XMPP/OTRXMPPManager.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#import "OTRXMPPTorManager.h"
5757
#import "OTRTorManager.h"
5858
@import OTRAssets;
59-
59+
@import ChatSecure_Push_iOS;
6060

6161
NSTimeInterval const kOTRChatStatePausedTimeout = 5;
6262
NSTimeInterval const kOTRChatStateInactiveTimeout = 120;

‎Gemfile

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
source "https://rubygems.org"
22

33
gem 'cocoapods'
4-
# Waiting for https://github.com/CocoaPods/CocoaPods/pull/9470
5-
# gem 'cocoapods', '1.9.0.beta.2'
64
gem 'fastlane'

0 commit comments

Comments
 (0)