@didomi/react-native 1.11.1 → 1.12.0

package/android/src/main/java/com/reactnativedidomi/DidomiModule.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.reactnativedidomi
 
 import android.util.Log
@@ -213,8 +215,9 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     private fun ReadableArray.toSet(): Set<String> {
         val set = mutableSetOf<String>()
 
-        for (i in 0 until size())
-            set.add(getString(i) ?: "")
+        for (i in 0 until size()) {
+            set.add(getString(i).orEmpty())
+        }
 
         return set
     }
@@ -245,7 +248,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         val map = WritableNativeMap()
         obj?.serializeToMap()?.entries?.forEach { entry ->
             when (val value = entry.value) {
-                is Map<*,*> -> map.putMap(entry.key, objectToWritableMap(value))
+                is Map<*, *> -> map.putMap(entry.key, objectToWritableMap(value))
                 is List<*> -> map.putArray(entry.key, Arguments.fromList(value))
                 else -> map.putString(entry.key, value.toString())
             }
@@ -266,7 +269,8 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         noticeId: String?,
         androidTvNoticeId: String?,
         androidTvEnabled: Boolean,
-        promise: Promise) {
+        promise: Promise
+    ) {
         try {
             Didomi.getInstance().addEventListener(eventListener)
 
@@ -287,9 +291,6 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
             val application = currentActivity?.application ?: throw IllegalStateException("No activity present")
             Didomi.getInstance().initialize(application, parameters)
 
-            Didomi.getInstance().onReady { prepareEvent(EventTypes.READY_CALLBACK.event, null) }
-            Didomi.getInstance().onError { prepareEvent(EventTypes.ERROR_CALLBACK.event, null) }
-
             promise.resolve(0)
 
         } catch (e: Exception) {
@@ -298,6 +299,18 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         }
     }
 
+    @ReactMethod
+    fun onReady(promise: Promise) {
+        Didomi.getInstance().onReady { prepareEvent(EventTypes.READY_CALLBACK.event, null) }
+        promise.resolve(0)
+    }
+
+    @ReactMethod
+    fun onError(promise: Promise) {
+        Didomi.getInstance().onError { prepareEvent(EventTypes.ERROR_CALLBACK.event, null) }
+        promise.resolve(0)
+    }
+
     @ReactMethod
     fun setupUI(promise: Promise) {
         try {
@@ -313,20 +326,23 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
 
     @ReactMethod
     fun setLogLevel(level: Int, promise: Promise) {
-        Didomi.getInstance().setLogLevel(when (level) {
-            0 -> Log.INFO
-            1 -> Log.DEBUG
-            2 -> Log.WARN
-            3 -> Log.ERROR
-            4 -> Log.VERBOSE
-            else -> Log.WARN
-        })
+        Didomi.getInstance().setLogLevel(
+            when (level) {
+                0 -> Log.INFO
+                1 -> Log.DEBUG
+                2 -> Log.WARN
+                3 -> Log.ERROR
+                4 -> Log.VERBOSE
+                else -> Log.WARN
+            }
+        )
         promise.resolve(0)
     }
 
     @ReactMethod
     fun getDisabledPurposes(promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(setToWritableArray(Didomi.getInstance().disabledPurposes))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -336,6 +352,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getDisabledPurposeIds(promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(setOfStringToWritableArray(Didomi.getInstance().disabledPurposeIds))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -345,6 +362,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getDisabledVendors(promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(setToWritableArray(Didomi.getInstance().disabledVendors))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -354,6 +372,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getDisabledVendorIds(promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(setOfStringToWritableArray(Didomi.getInstance().disabledVendorIds))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -363,6 +382,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getEnabledPurposes(promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(setToWritableArray(Didomi.getInstance().enabledPurposes))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -372,6 +392,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getEnabledPurposeIds(promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(setOfStringToWritableArray(Didomi.getInstance().enabledPurposeIds))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -381,6 +402,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getEnabledVendors(promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(setToWritableArray(Didomi.getInstance().enabledVendors))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -390,6 +412,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getEnabledVendorIds(promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(setOfStringToWritableArray(Didomi.getInstance().enabledVendorIds))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -399,12 +422,11 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getJavaScriptForWebView(extra: String?, promise: Promise) {
         try {
-            extra?.let {
+            extra?.also {
                 promise.resolve(Didomi.getInstance().getJavaScriptForWebView(extra))
             } ?: run {
                 promise.resolve(Didomi.getInstance().getJavaScriptForWebView())
             }
-
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -492,6 +514,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserConsentStatusForPurpose(purposeId: String, promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(Didomi.getInstance().getUserConsentStatusForPurpose(purposeId))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -501,6 +524,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserConsentStatusForVendor(vendorId: String, promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(Didomi.getInstance().getUserConsentStatusForVendor(vendorId))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -510,6 +534,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserConsentStatusForVendorAndRequiredPurposes(vendorId: String, promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(Didomi.getInstance().getUserConsentStatusForVendorAndRequiredPurposes(vendorId))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -519,6 +544,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserLegitimateInterestStatusForPurpose(purposeId: String, promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(Didomi.getInstance().getUserLegitimateInterestStatusForPurpose(purposeId))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -528,6 +554,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserLegitimateInterestForVendor(vendorId: String, promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(Didomi.getInstance().getUserLegitimateInterestStatusForVendor(vendorId))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -537,6 +564,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserLegitimateInterestStatusForVendorAndRequiredPurposes(vendorId: String, promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(Didomi.getInstance().getUserLegitimateInterestStatusForVendorAndRequiredPurposes(vendorId))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -555,6 +583,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserStatusForVendor(vendorId: String, promise: Promise) {
         try {
+            @Suppress("DEPRECATION")
             promise.resolve(Didomi.getInstance().getUserStatusForVendor(vendorId))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
@@ -643,22 +672,26 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUser(organizationUserId: String,
-                organizationUserIdAuthAlgorithm: String?,
-                organizationUserIdAuthSid: String?,
-                organizationUserIdAuthSalt: String?,
-                organizationUserIdAuthDigest: String?,
-                promise: Promise) {
+    fun setUser(
+        organizationUserId: String,
+        organizationUserIdAuthAlgorithm: String?,
+        organizationUserIdAuthSid: String?,
+        organizationUserIdAuthSalt: String?,
+        organizationUserIdAuthDigest: String?,
+        promise: Promise
+    ) {
         if (organizationUserIdAuthAlgorithm != null
-                && organizationUserIdAuthSid != null
-                && organizationUserIdAuthSalt != null
-                && organizationUserIdAuthDigest != null) {
+            && organizationUserIdAuthSid != null
+            && organizationUserIdAuthSalt != null
+            && organizationUserIdAuthDigest != null
+        ) {
+            @Suppress("DEPRECATION")
             Didomi.getInstance().setUser(
-                    organizationUserId,
-                    organizationUserIdAuthAlgorithm,
-                    organizationUserIdAuthSid,
-                    organizationUserIdAuthSalt,
-                    organizationUserIdAuthDigest
+                organizationUserId,
+                organizationUserIdAuthAlgorithm,
+                organizationUserIdAuthSid,
+                organizationUserIdAuthSalt,
+                organizationUserIdAuthDigest
             )
         } else {
             Didomi.getInstance().setUser(organizationUserId)
@@ -674,12 +707,14 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserWithHashAuth(organizationUserId: String,
-                algorithm: String,
-                secretId: String,
-                digest: String,
-                salt: String?,
-                promise: Promise) {
+    fun setUserWithHashAuth(
+        organizationUserId: String,
+        algorithm: String,
+        secretId: String,
+        digest: String,
+        salt: String?,
+        promise: Promise
+    ) {
         Didomi.getInstance().setUser(
             UserAuthWithHashParams(
                 organizationUserId,
@@ -693,12 +728,14 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserWithHashAuthAndSetupUI(organizationUserId: String,
-                algorithm: String,
-                secretId: String,
-                digest: String,
-                salt: String?,
-                promise: Promise) {
+    fun setUserWithHashAuthAndSetupUI(
+        organizationUserId: String,
+        algorithm: String,
+        secretId: String,
+        digest: String,
+        salt: String?,
+        promise: Promise
+    ) {
         Didomi.getInstance().setUser(
             UserAuthWithHashParams(
                 organizationUserId,
@@ -713,13 +750,15 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserWithHashAuthWithExpiration(organizationUserId: String,
-                algorithm: String,
-                secretId: String,
-                digest: String,
-                salt: String?,
-                expiration: Int,
-                promise: Promise) {
+    fun setUserWithHashAuthWithExpiration(
+        organizationUserId: String,
+        algorithm: String,
+        secretId: String,
+        digest: String,
+        salt: String?,
+        expiration: Int,
+        promise: Promise
+    ) {
         Didomi.getInstance().setUser(
             UserAuthWithHashParams(
                 organizationUserId,
@@ -734,13 +773,15 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserWithHashAuthWithExpirationAndSetupUI(organizationUserId: String,
-                algorithm: String,
-                secretId: String,
-                digest: String,
-                salt: String?,
-                expiration: Int,
-                promise: Promise) {
+    fun setUserWithHashAuthWithExpirationAndSetupUI(
+        organizationUserId: String,
+        algorithm: String,
+        secretId: String,
+        digest: String,
+        salt: String?,
+        expiration: Int,
+        promise: Promise
+    ) {
         Didomi.getInstance().setUser(
             UserAuthWithHashParams(
                 organizationUserId,
@@ -756,11 +797,13 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserWithEncryptionAuth(organizationUserId: String,
-                            algorithm: String,
-                            secretId: String,
-                            initializationVector: String,
-                            promise: Promise) {
+    fun setUserWithEncryptionAuth(
+        organizationUserId: String,
+        algorithm: String,
+        secretId: String,
+        initializationVector: String,
+        promise: Promise
+    ) {
         Didomi.getInstance().setUser(
             UserAuthWithEncryptionParams(
                 organizationUserId,
@@ -773,11 +816,13 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserWithEncryptionAuthAndSetupUI(organizationUserId: String,
-                            algorithm: String,
-                            secretId: String,
-                            initializationVector: String,
-                            promise: Promise) {
+    fun setUserWithEncryptionAuthAndSetupUI(
+        organizationUserId: String,
+        algorithm: String,
+        secretId: String,
+        initializationVector: String,
+        promise: Promise
+    ) {
         Didomi.getInstance().setUser(
             UserAuthWithEncryptionParams(
                 organizationUserId,
@@ -791,12 +836,14 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserWithEncryptionAuthWithExpiration(organizationUserId: String,
-                            algorithm: String,
-                            secretId: String,
-                            initializationVector: String,
-                            expiration: Int,
-                            promise: Promise) {
+    fun setUserWithEncryptionAuthWithExpiration(
+        organizationUserId: String,
+        algorithm: String,
+        secretId: String,
+        initializationVector: String,
+        expiration: Int,
+        promise: Promise
+    ) {
         Didomi.getInstance().setUser(
             UserAuthWithEncryptionParams(
                 organizationUserId,
@@ -810,12 +857,14 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserWithEncryptionAuthWithExpirationAndSetupUI(organizationUserId: String,
-                            algorithm: String,
-                            secretId: String,
-                            initializationVector: String,
-                            expiration: Int,
-                            promise: Promise) {
+    fun setUserWithEncryptionAuthWithExpirationAndSetupUI(
+        organizationUserId: String,
+        algorithm: String,
+        secretId: String,
+        initializationVector: String,
+        expiration: Int,
+        promise: Promise
+    ) {
         Didomi.getInstance().setUser(
             UserAuthWithEncryptionParams(
                 organizationUserId,
@@ -878,17 +927,20 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
 
     @ReactMethod
     @Deprecated("Deprecated in the Didomi API")
-    fun setUserConsentStatus(enabledPurposeIds: ReadableArray,
-                             disabledPurposeIds: ReadableArray,
-                             enabledLegitimatePurposeIds: ReadableArray,
-                             disabledLegitimatePurposeIds: ReadableArray,
-                             enabledVendorIds: ReadableArray,
-                             disabledVendorIds: ReadableArray,
-                             enabledLegIntVendorIds: ReadableArray,
-                             disabledLegIntVendorIds: ReadableArray,
-                             promise: Promise) {
-        try {
-            promise.resolve(Didomi.getInstance().setUserStatus(
+    fun setUserConsentStatus(
+        enabledPurposeIds: ReadableArray,
+        disabledPurposeIds: ReadableArray,
+        enabledLegitimatePurposeIds: ReadableArray,
+        disabledLegitimatePurposeIds: ReadableArray,
+        enabledVendorIds: ReadableArray,
+        disabledVendorIds: ReadableArray,
+        enabledLegIntVendorIds: ReadableArray,
+        disabledLegIntVendorIds: ReadableArray,
+        promise: Promise
+    ) {
+        try {
+            promise.resolve(
+                Didomi.getInstance().setUserStatus(
                     enabledPurposeIds.toSet(),
                     disabledPurposeIds.toSet(),
                     enabledLegitimatePurposeIds.toSet(),
@@ -896,7 +948,9 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
                     enabledVendorIds.toSet(),
                     disabledVendorIds.toSet(),
                     enabledLegIntVendorIds.toSet(),
-                    disabledLegIntVendorIds.toSet()))
+                    disabledLegIntVendorIds.toSet()
+                )
+            )
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -912,34 +966,42 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     }
 
     @ReactMethod
-    fun setUserStatus(purposesConsentStatus: Boolean,
-                      purposesLIStatus: Boolean,
-                      vendorsConsentStatus: Boolean,
-                      vendorsLIStatus: Boolean,
-                      promise: Promise) {
+    fun setUserStatus(
+        purposesConsentStatus: Boolean,
+        purposesLIStatus: Boolean,
+        vendorsConsentStatus: Boolean,
+        vendorsLIStatus: Boolean,
+        promise: Promise
+    ) {
         try {
-            promise.resolve(Didomi.getInstance().setUserStatus(
+            promise.resolve(
+                Didomi.getInstance().setUserStatus(
                     purposesConsentStatus,
                     purposesLIStatus,
                     vendorsConsentStatus,
-                    vendorsLIStatus))
+                    vendorsLIStatus
+                )
+            )
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
     }
 
     @ReactMethod
-    fun setUserStatusSets(enabledConsentPurposeIds: ReadableArray,
-                          disabledConsentPurposeIds: ReadableArray,
-                          enabledLIPurposeIds: ReadableArray,
-                          disabledLIPurposeIds: ReadableArray,
-                          enabledConsentVendorIds: ReadableArray,
-                          disabledConsentVendorIds: ReadableArray,
-                          enabledLIVendorIds: ReadableArray,
-                          disabledLIVendorIds: ReadableArray,
-                          promise: Promise) {
+    fun setUserStatusSets(
+        enabledConsentPurposeIds: ReadableArray,
+        disabledConsentPurposeIds: ReadableArray,
+        enabledLIPurposeIds: ReadableArray,
+        disabledLIPurposeIds: ReadableArray,
+        enabledConsentVendorIds: ReadableArray,
+        disabledConsentVendorIds: ReadableArray,
+        enabledLIVendorIds: ReadableArray,
+        disabledLIVendorIds: ReadableArray,
+        promise: Promise
+    ) {
         try {
-            promise.resolve(Didomi.getInstance().setUserStatus(
+            promise.resolve(
+                Didomi.getInstance().setUserStatus(
                     enabledConsentPurposeIds.toSet(),
                     disabledConsentPurposeIds.toSet(),
                     enabledLIPurposeIds.toSet(),
@@ -948,7 +1010,8 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
                     disabledConsentVendorIds.toSet(),
                     enabledLIVendorIds.toSet(),
                     disabledLIVendorIds.toSet()
-            ))
+                )
+            )
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -973,10 +1036,22 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         }
     }
 
+    @Suppress("UNUSED_PARAMETER")
+    @ReactMethod
+    fun addListener(eventName: String) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    @ReactMethod
+    fun removeListeners(count: Int) {
+        // Keep: Required for RN built in Event Emitter Calls.
+    }
+
     private fun prepareEvent(eventName: String, params: String?) {
         Log.d("prepareEvent", "Sending $eventName")
         reactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit(eventName, params)
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+            .emit(eventName, params)
     }
 }

package/ios/Didomi.m

@@ -17,9 +17,11 @@ RCT_EXTERN_METHOD(initialize:(NSString *)userAgentName
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(onReady)
+RCT_EXTERN_METHOD(onReady:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(onError)
+RCT_EXTERN_METHOD(onError:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(getQueryStringForWebView:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)

package/ios/Didomi.xcodeproj/project.pbxproj

@@ -136,7 +136,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -175,7 +175,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -186,7 +186,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -218,7 +218,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;