Skip to content

Commit 0911b63

Browse files
hvgehvge
authored
Merge pull request #691 from /issues/689-xcode16.3-sdk-1.7.x
2 parents 0f6c356 + bdbb099 commit 0911b63

17 files changed

+23
-47
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
build:
1515
name: Build
16-
runs-on: macos-12
16+
runs-on: macos-15
1717
steps:
1818
- name: Checkout the repo
1919
uses: actions/checkout@v3

‎cc7

‎proj-xcode/PowerAuth2.xcodeproj/xcshareddata/xcschemes/PowerAuth2_IntegrationTests_iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuth2.xcodeproj/xcshareddata/xcschemes/PowerAuth2_IntegrationTests_tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuth2.xcodeproj/xcshareddata/xcschemes/PowerAuth2_TestHostApp_iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuth2.xcodeproj/xcshareddata/xcschemes/PowerAuth2_TestHostApp_tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuth2.xcodeproj/xcshareddata/xcschemes/PowerAuth2_iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuth2.xcodeproj/xcshareddata/xcschemes/PowerAuth2_tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuthCore.xcodeproj/project.pbxproj

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@
14611461
ALWAYS_SEARCH_USER_PATHS = NO;
14621462
CLANG_ANALYZER_NONNULL = YES;
14631463
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
1464-
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
1464+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
14651465
CLANG_CXX_LIBRARY = "libc++";
14661466
CLANG_ENABLE_MODULES = YES;
14671467
CLANG_ENABLE_OBJC_ARC = YES;
@@ -1493,7 +1493,7 @@
14931493
DEBUG_INFORMATION_FORMAT = dwarf;
14941494
ENABLE_STRICT_OBJC_MSGSEND = YES;
14951495
ENABLE_TESTABILITY = YES;
1496-
GCC_C_LANGUAGE_STANDARD = c11;
1496+
GCC_C_LANGUAGE_STANDARD = c17;
14971497
GCC_DYNAMIC_NO_PIC = NO;
14981498
GCC_NO_COMMON_BLOCKS = YES;
14991499
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1531,7 +1531,7 @@
15311531
ALWAYS_SEARCH_USER_PATHS = NO;
15321532
CLANG_ANALYZER_NONNULL = YES;
15331533
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
1534-
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
1534+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
15351535
CLANG_CXX_LIBRARY = "libc++";
15361536
CLANG_ENABLE_MODULES = YES;
15371537
CLANG_ENABLE_OBJC_ARC = YES;
@@ -1563,7 +1563,7 @@
15631563
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15641564
ENABLE_NS_ASSERTIONS = NO;
15651565
ENABLE_STRICT_OBJC_MSGSEND = YES;
1566-
GCC_C_LANGUAGE_STANDARD = c11;
1566+
GCC_C_LANGUAGE_STANDARD = c17;
15671567
GCC_NO_COMMON_BLOCKS = YES;
15681568
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
15691569
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -1612,7 +1612,6 @@
16121612
BF6ADD1B24C8486D001B3E5E /* Debug */ = {
16131613
isa = XCBuildConfiguration;
16141614
buildSettings = {
1615-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
16161615
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
16171616
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
16181617
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
@@ -1622,7 +1621,6 @@
16221621
DYLIB_COMPATIBILITY_VERSION = 1;
16231622
DYLIB_CURRENT_VERSION = 1;
16241623
DYLIB_INSTALL_NAME_BASE = "@rpath";
1625-
GCC_C_LANGUAGE_STANDARD = gnu11;
16261624
INFOPLIST_FILE = PowerAuthCore/Info.plist;
16271625
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
16281626
LD_RUNPATH_SEARCH_PATHS = (
@@ -1650,7 +1648,6 @@
16501648
BF6ADD1C24C8486D001B3E5E /* Release */ = {
16511649
isa = XCBuildConfiguration;
16521650
buildSettings = {
1653-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
16541651
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
16551652
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
16561653
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
@@ -1660,7 +1657,6 @@
16601657
DYLIB_COMPATIBILITY_VERSION = 1;
16611658
DYLIB_CURRENT_VERSION = 1;
16621659
DYLIB_INSTALL_NAME_BASE = "@rpath";
1663-
GCC_C_LANGUAGE_STANDARD = gnu11;
16641660
INFOPLIST_FILE = PowerAuthCore/Info.plist;
16651661
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
16661662
LD_RUNPATH_SEARCH_PATHS = (
@@ -1688,7 +1684,6 @@
16881684
BF6ADD5E24C84A3D001B3E5E /* Debug */ = {
16891685
isa = XCBuildConfiguration;
16901686
buildSettings = {
1691-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
16921687
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
16931688
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
16941689
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
@@ -1698,7 +1693,6 @@
16981693
DYLIB_COMPATIBILITY_VERSION = 1;
16991694
DYLIB_CURRENT_VERSION = 1;
17001695
DYLIB_INSTALL_NAME_BASE = "@rpath";
1701-
GCC_C_LANGUAGE_STANDARD = gnu11;
17021696
INFOPLIST_FILE = PowerAuthCore/Info.plist;
17031697
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
17041698
LD_RUNPATH_SEARCH_PATHS = (
@@ -1726,7 +1720,6 @@
17261720
BF6ADD5F24C84A3D001B3E5E /* Release */ = {
17271721
isa = XCBuildConfiguration;
17281722
buildSettings = {
1729-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
17301723
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
17311724
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
17321725
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
@@ -1736,7 +1729,6 @@
17361729
DYLIB_COMPATIBILITY_VERSION = 1;
17371730
DYLIB_CURRENT_VERSION = 1;
17381731
DYLIB_INSTALL_NAME_BASE = "@rpath";
1739-
GCC_C_LANGUAGE_STANDARD = gnu11;
17401732
INFOPLIST_FILE = PowerAuthCore/Info.plist;
17411733
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
17421734
LD_RUNPATH_SEARCH_PATHS = (
@@ -1784,9 +1776,7 @@
17841776
BF6ADDAC24C84FE0001B3E5E /* Debug */ = {
17851777
isa = XCBuildConfiguration;
17861778
buildSettings = {
1787-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
17881779
CODE_SIGN_STYLE = Automatic;
1789-
GCC_C_LANGUAGE_STANDARD = gnu11;
17901780
HEADER_SEARCH_PATHS = (
17911781
"$(inherited)",
17921782
"$(PROJECT_DIR)/../src/PowerAuth",
@@ -1801,9 +1791,7 @@
18011791
BF6ADDAD24C84FE0001B3E5E /* Release */ = {
18021792
isa = XCBuildConfiguration;
18031793
buildSettings = {
1804-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
18051794
CODE_SIGN_STYLE = Automatic;
1806-
GCC_C_LANGUAGE_STANDARD = gnu11;
18071795
HEADER_SEARCH_PATHS = (
18081796
"$(inherited)",
18091797
"$(PROJECT_DIR)/../src/PowerAuth",
@@ -1818,13 +1806,11 @@
18181806
BF86E66126395AD3004C8AE5 /* Debug */ = {
18191807
isa = XCBuildConfiguration;
18201808
buildSettings = {
1821-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
18221809
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
18231810
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
18241811
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
18251812
CODE_SIGN_STYLE = Automatic;
18261813
DEVELOPMENT_TEAM = KTT9G859MR;
1827-
GCC_C_LANGUAGE_STANDARD = gnu11;
18281814
INFOPLIST_FILE = PowerAuthCoreTests/Info.plist;
18291815
LD_RUNPATH_SEARCH_PATHS = (
18301816
"$(inherited)",
@@ -1842,13 +1828,11 @@
18421828
BF86E66226395AD3004C8AE5 /* Release */ = {
18431829
isa = XCBuildConfiguration;
18441830
buildSettings = {
1845-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
18461831
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
18471832
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
18481833
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
18491834
CODE_SIGN_STYLE = Automatic;
18501835
DEVELOPMENT_TEAM = KTT9G859MR;
1851-
GCC_C_LANGUAGE_STANDARD = gnu11;
18521836
INFOPLIST_FILE = PowerAuthCoreTests/Info.plist;
18531837
LD_RUNPATH_SEARCH_PATHS = (
18541838
"$(inherited)",
@@ -1866,13 +1850,11 @@
18661850
BF86E6EA26395F2C004C8AE5 /* Debug */ = {
18671851
isa = XCBuildConfiguration;
18681852
buildSettings = {
1869-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
18701853
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
18711854
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
18721855
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
18731856
CODE_SIGN_STYLE = Automatic;
18741857
DEVELOPMENT_TEAM = KTT9G859MR;
1875-
GCC_C_LANGUAGE_STANDARD = gnu11;
18761858
INFOPLIST_FILE = PowerAuthCoreTests/Info.plist;
18771859
LD_RUNPATH_SEARCH_PATHS = (
18781860
"$(inherited)",
@@ -1890,13 +1872,11 @@
18901872
BF86E6EB26395F2C004C8AE5 /* Release */ = {
18911873
isa = XCBuildConfiguration;
18921874
buildSettings = {
1893-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
18941875
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
18951876
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
18961877
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
18971878
CODE_SIGN_STYLE = Automatic;
18981879
DEVELOPMENT_TEAM = KTT9G859MR;
1899-
GCC_C_LANGUAGE_STANDARD = gnu11;
19001880
INFOPLIST_FILE = PowerAuthCoreTests/Info.plist;
19011881
LD_RUNPATH_SEARCH_PATHS = (
19021882
"$(inherited)",
@@ -1914,9 +1894,7 @@
19141894
BF99D91C2073E17000735ED2 /* Debug */ = {
19151895
isa = XCBuildConfiguration;
19161896
buildSettings = {
1917-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
19181897
CODE_SIGN_STYLE = Automatic;
1919-
GCC_C_LANGUAGE_STANDARD = gnu11;
19201898
HEADER_SEARCH_PATHS = (
19211899
"$(inherited)",
19221900
"$(PROJECT_DIR)/../src/PowerAuth",
@@ -1931,9 +1909,7 @@
19311909
BF99D91D2073E17000735ED2 /* Release */ = {
19321910
isa = XCBuildConfiguration;
19331911
buildSettings = {
1934-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
19351912
CODE_SIGN_STYLE = Automatic;
1936-
GCC_C_LANGUAGE_STANDARD = gnu11;
19371913
HEADER_SEARCH_PATHS = (
19381914
"$(inherited)",
19391915
"$(PROJECT_DIR)/../src/PowerAuth",

‎proj-xcode/PowerAuthCore.xcodeproj/xcshareddata/xcschemes/PowerAuthCoreTests_iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuthCore.xcodeproj/xcshareddata/xcschemes/PowerAuthCoreTests_tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuthCore.xcodeproj/xcshareddata/xcschemes/PowerAuthCore_iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎proj-xcode/PowerAuthCore.xcodeproj/xcshareddata/xcschemes/PowerAuthCore_tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎src/Android.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ NDK_TOOLCHAIN_VERSION := clang
2727
# Library name
2828
LOCAL_MODULE := libPowerAuth2
2929
LOCAL_CFLAGS := $(EXTERN_CFLAGS)
30-
LOCAL_CPPFLAGS := $(EXTERN_CFLAGS) -std=c++11
30+
LOCAL_CPPFLAGS := $(EXTERN_CFLAGS) -std=c++17
3131
LOCAL_CPP_FEATURES += exceptions
3232
LOCAL_STATIC_LIBRARIES := cc7
3333

@@ -73,7 +73,7 @@ NDK_TOOLCHAIN_VERSION := clang
7373
# Library name
7474
LOCAL_MODULE := libPowerAuth2Tests
7575
LOCAL_CFLAGS := $(EXTERN_CFLAGS)
76-
LOCAL_CPPFLAGS := $(EXTERN_CFLAGS) -std=c++11
76+
LOCAL_CPPFLAGS := $(EXTERN_CFLAGS) -std=c++17
7777
LOCAL_CPP_FEATURES += exceptions
7878
LOCAL_STATIC_LIBRARIES := cc7tests
7979

@@ -121,7 +121,7 @@ NDK_TOOLCHAIN_VERSION := clang
121121
# Library name
122122
LOCAL_MODULE := PowerAuth2Module
123123
LOCAL_CFLAGS := $(EXTERN_CFLAGS) -fvisibility=hidden -fpic
124-
LOCAL_CPPFLAGS := $(EXTERN_CFLAGS) -fvisibility=hidden -fpic -std=c++11
124+
LOCAL_CPPFLAGS := $(EXTERN_CFLAGS) -fvisibility=hidden -fpic -std=c++17
125125
LOCAL_CPP_FEATURES += exceptions
126126

127127
LOCAL_STATIC_LIBRARIES := PowerAuth2

‎src/PowerAuth/crypto/PRNG.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ namespace crypto
6161
}
6262

6363

64-
cc7::ByteArray GetUniqueRandomData(size_t size, const std::vector<const cc7::ByteRange> & reject_byte_sequences)
64+
cc7::ByteArray GetUniqueRandomData(size_t size, const std::vector<cc7::ByteRange> & reject_byte_sequences)
6565
{
6666
cc7::ByteArray data(size, 0);
6767
size_t attempts = 16;

‎src/PowerAuth/crypto/PRNG.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace crypto
4444
sequence is not equal to any byte sequence, provided in the |reject_byte_sequences|
4545
vector.
4646
*/
47-
cc7::ByteArray GetUniqueRandomData(size_t size, const std::vector<const cc7::ByteRange> & reject_byte_sequences);
47+
cc7::ByteArray GetUniqueRandomData(size_t size, const std::vector<cc7::ByteRange> & reject_byte_sequences);
4848

4949
/**
5050
The method res-seeds OpenSSL's pseudo random number generator with another

‎src/PowerAuth/utils/DataReader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ namespace utils
209209

210210
bool DataReader::readCount(size_t & out_value)
211211
{
212-
byte tmp[4];
212+
cc7::byte tmp[4];
213213
if (!readByte(tmp[0])) {
214214
return false;
215215
}
216-
const byte marker = tmp[0] & 0xC0;
216+
const cc7::byte marker = tmp[0] & 0xC0;
217217
if (marker == 0x00 || marker == 0x40) {
218218
// just one byte
219219
out_value = tmp[0];

0 commit comments

Comments
 (0)