Skip to content

Commit 52dfcdb

Browse files
danielrbrownedanielrbrowne
committed
'Consumption-Tests' changes for SPM encrypted channels support
- Increases 'MINIMUM_SUPPORTED_XCODE_VERSION' from 11.0 to 12.0 (Due to swift-sodium 0.8.0 -> 0.9.0 upgrade) - Ensures all relevant test targets are built - Ensures SPM macOS test targets aren't code signed (resolves error due to swift-sodium upgrade)
1 parent bba7303 commit 52dfcdb

File tree

6 files changed

+22
-13
lines changed

6 files changed

+22
-13
lines changed

‎Consumption-Tests/MINIMUM_SUPPORTED_XCODE_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Xcode 11.0
1+
Xcode 12.0

‎Consumption-Tests/Shared/performTests.sh

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,16 @@ function runXcodeBuild {
9999
echo "NAME=$NAME"
100100
local SCHEME="$2"
101101
echo "SCHEME=$SCHEME"
102-
103-
if [[ "$NAME" == "SwiftPackageManager"* ]] && [[ "$SCHEME" == *"WithEncryption" ]]; then
104-
SUMMARY_LOG_OUTPUT+="\n 🔘 $SCHEME (SPM integration not supported with PusherSwiftWithEncryption)"
105-
echo "**** SKIPPING '$NAME - $SCHEME' ****"
106-
echo "------ END: $FUNCNAME $@ ------"
107-
return 0
108-
fi
109-
110-
if [[ "$NAME" == "SwiftPackageManager-Minimum" ]] && [[ "$SCHEME" == "ObjectiveC"* ]]; then
111-
SUMMARY_LOG_OUTPUT+="\n 🔘 $SCHEME (SPM integration not supported with Obj-C in Xcode versions < v11.4)"
102+
103+
if [[ "$SCHEME" == *"tvOS-WithEncryption" ]]; then
104+
SUMMARY_LOG_OUTPUT+="\n 🔘 $SCHEME (tvOS is not supported with PusherSwiftWithEncryption)"
112105
echo "**** SKIPPING '$NAME - $SCHEME' ****"
113106
echo "------ END: $FUNCNAME $@ ------"
114107
return 0
115108
fi
116109

117-
if [[ "$SCHEME" == *"tvOS-WithEncryption" ]]; then
118-
SUMMARY_LOG_OUTPUT+="\n 🔘 $SCHEME (tvOS is not supported with PusherSwiftWithEncryption)"
110+
if [[ "$NAME" == "SwiftPackageManager"* ]] && [[ "$SCHEME" == *"WithoutEncryption" ]]; then
111+
SUMMARY_LOG_OUTPUT+="\n 🔘 $SCHEME (SPM integration does not expose PusherSwift module)"
119112
echo "**** SKIPPING '$NAME - $SCHEME' ****"
120113
echo "------ END: $FUNCNAME $@ ------"
121114
return 0

‎Consumption-Tests/SwiftPackageManager-Latest/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,7 @@
847847
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
848848
CLANG_ENABLE_OBJC_WEAK = YES;
849849
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
850+
CODE_SIGN_IDENTITY = "";
850851
CODE_SIGN_STYLE = Automatic;
851852
COMBINE_HIDPI_IMAGES = YES;
852853
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -870,6 +871,7 @@
870871
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
871872
CLANG_ENABLE_OBJC_WEAK = YES;
872873
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
874+
CODE_SIGN_IDENTITY = "";
873875
CODE_SIGN_STYLE = Automatic;
874876
COMBINE_HIDPI_IMAGES = YES;
875877
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -928,6 +930,7 @@
928930
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
929931
CLANG_ENABLE_OBJC_WEAK = YES;
930932
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
933+
CODE_SIGN_IDENTITY = "";
931934
CODE_SIGN_STYLE = Automatic;
932935
COMBINE_HIDPI_IMAGES = YES;
933936
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -955,6 +958,7 @@
955958
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
956959
CLANG_ENABLE_OBJC_WEAK = YES;
957960
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
961+
CODE_SIGN_IDENTITY = "";
958962
CODE_SIGN_STYLE = Automatic;
959963
COMBINE_HIDPI_IMAGES = YES;
960964
GCC_C_LANGUAGE_STANDARD = gnu11;

‎Consumption-Tests/SwiftPackageManager-Latest/Swift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,7 @@
860860
CLANG_ENABLE_OBJC_WEAK = YES;
861861
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
862862
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
863+
CODE_SIGN_IDENTITY = "";
863864
CODE_SIGN_STYLE = Automatic;
864865
COMBINE_HIDPI_IMAGES = YES;
865866
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -886,6 +887,7 @@
886887
CLANG_ENABLE_OBJC_WEAK = YES;
887888
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
888889
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
890+
CODE_SIGN_IDENTITY = "";
889891
CODE_SIGN_STYLE = Automatic;
890892
COMBINE_HIDPI_IMAGES = YES;
891893
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -954,6 +956,7 @@
954956
CLANG_ENABLE_OBJC_WEAK = YES;
955957
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
956958
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
959+
CODE_SIGN_IDENTITY = "";
957960
CODE_SIGN_STYLE = Automatic;
958961
COMBINE_HIDPI_IMAGES = YES;
959962
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -981,6 +984,7 @@
981984
CLANG_ENABLE_OBJC_WEAK = YES;
982985
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
983986
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
987+
CODE_SIGN_IDENTITY = "";
984988
CODE_SIGN_STYLE = Automatic;
985989
COMBINE_HIDPI_IMAGES = YES;
986990
GCC_C_LANGUAGE_STANDARD = gnu11;

‎Consumption-Tests/SwiftPackageManager-Minimum/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,7 @@
847847
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
848848
CLANG_ENABLE_OBJC_WEAK = YES;
849849
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
850+
CODE_SIGN_IDENTITY = "";
850851
CODE_SIGN_STYLE = Automatic;
851852
COMBINE_HIDPI_IMAGES = YES;
852853
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -870,6 +871,7 @@
870871
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
871872
CLANG_ENABLE_OBJC_WEAK = YES;
872873
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
874+
CODE_SIGN_IDENTITY = "";
873875
CODE_SIGN_STYLE = Automatic;
874876
COMBINE_HIDPI_IMAGES = YES;
875877
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -928,6 +930,7 @@
928930
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
929931
CLANG_ENABLE_OBJC_WEAK = YES;
930932
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
933+
CODE_SIGN_IDENTITY = "";
931934
CODE_SIGN_STYLE = Automatic;
932935
COMBINE_HIDPI_IMAGES = YES;
933936
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -955,6 +958,7 @@
955958
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
956959
CLANG_ENABLE_OBJC_WEAK = YES;
957960
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
961+
CODE_SIGN_IDENTITY = "";
958962
CODE_SIGN_STYLE = Automatic;
959963
COMBINE_HIDPI_IMAGES = YES;
960964
GCC_C_LANGUAGE_STANDARD = gnu11;

‎Consumption-Tests/SwiftPackageManager-Minimum/Swift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,7 @@
860860
CLANG_ENABLE_OBJC_WEAK = YES;
861861
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
862862
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
863+
CODE_SIGN_IDENTITY = "";
863864
CODE_SIGN_STYLE = Automatic;
864865
COMBINE_HIDPI_IMAGES = YES;
865866
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -886,6 +887,7 @@
886887
CLANG_ENABLE_OBJC_WEAK = YES;
887888
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
888889
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
890+
CODE_SIGN_IDENTITY = "";
889891
CODE_SIGN_STYLE = Automatic;
890892
COMBINE_HIDPI_IMAGES = YES;
891893
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -954,6 +956,7 @@
954956
CLANG_ENABLE_OBJC_WEAK = YES;
955957
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
956958
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
959+
CODE_SIGN_IDENTITY = "";
957960
CODE_SIGN_STYLE = Automatic;
958961
COMBINE_HIDPI_IMAGES = YES;
959962
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -981,6 +984,7 @@
981984
CLANG_ENABLE_OBJC_WEAK = YES;
982985
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
983986
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
987+
CODE_SIGN_IDENTITY = "";
984988
CODE_SIGN_STYLE = Automatic;
985989
COMBINE_HIDPI_IMAGES = YES;
986990
GCC_C_LANGUAGE_STANDARD = gnu11;

0 commit comments

Comments
 (0)