From 519628de5cc9480e722773829892f9a67faf3d05 Mon Sep 17 00:00:00 2001
From: yves tessier <yves@prospects.com>
Date: Tue, 19 Oct 2021 12:29:59 -0400
Subject: [PATCH] fix compilation with xcode 13

---
 build.gradle.kts                    | 3 +--
 firebase-app/build.gradle.kts       | 2 +-
 firebase-auth/build.gradle.kts      | 2 +-
 firebase-config/build.gradle.kts    | 2 +-
 firebase-database/build.gradle.kts  | 2 +-
 firebase-firestore/build.gradle.kts | 2 +-
 firebase-functions/build.gradle.kts | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e512e1f2a..1bf79cd0b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -162,8 +162,7 @@ subprojects {
                     args(
                         it,
                         "--project-directory", projectDir.resolve("src/nativeInterop/cinterop"),
-                        "--platform", "iOS",
-                        "--cache-builds"
+                        "--platform", "iOS"
                     )
                 }
             }
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
index eff011173..530e4ba3e 100644
--- a/firebase-app/build.gradle.kts
+++ b/firebase-app/build.gradle.kts
@@ -90,7 +90,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseCore") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
index 00c0a4be8..1402f4358 100644
--- a/firebase-auth/build.gradle.kts
+++ b/firebase-auth/build.gradle.kts
@@ -119,7 +119,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseAuth") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
index 6af6ec0ea..6b113bdcd 100644
--- a/firebase-config/build.gradle.kts
+++ b/firebase-config/build.gradle.kts
@@ -104,7 +104,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseRemoteConfig") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
index 8b5c08b7d..ab68f72d1 100644
--- a/firebase-database/build.gradle.kts
+++ b/firebase-database/build.gradle.kts
@@ -95,7 +95,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseDatabase") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
index bff60b38e..243bf2cd1 100644
--- a/firebase-firestore/build.gradle.kts
+++ b/firebase-firestore/build.gradle.kts
@@ -102,7 +102,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseFirestore") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
index f9e42f1ce..6174f47d0 100644
--- a/firebase-functions/build.gradle.kts
+++ b/firebase-functions/build.gradle.kts
@@ -90,7 +90,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseFunctions") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }