fix compilation with xcode 13 (#244)

muwasi · yves tessier · web-flow · commit a1b99ceaa069 · 2021-11-23T00:10:48.000Z
Co-authored-by: yves tessier &lt;yves@prospects.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,7 @@ subprojects {`
`162`	`162`	`args(`
`163`	`163`	`it,`
`164`	`164`	`"--project-directory", projectDir.resolve("src/nativeInterop/cinterop"),`
`165`		`- "--platform", "iOS",`
`166`		`- "--cache-builds"`
	`165`	`+ "--platform", "iOS"`
`167`	`166`	`)`
`168`	`167`	`}`
`169`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ kotlin {`
`90`	`90`	`compilations.getByName("main") {`
`91`	`91`	`cinterops.create("FirebaseCore") {`
`92`	`92`	`compilerOpts(nativeFrameworkPaths.map { "-F$it" })`
`93`		`- extraOpts("-verbose")`
	`93`	`+ extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ kotlin {`
`119`	`119`	`compilations.getByName("main") {`
`120`	`120`	`cinterops.create("FirebaseAuth") {`
`121`	`121`	`compilerOpts(nativeFrameworkPaths.map { "-F$it" })`
`122`		`- extraOpts("-verbose")`
	`122`	`+ extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ kotlin {`
`104`	`104`	`compilations.getByName("main") {`
`105`	`105`	`cinterops.create("FirebaseRemoteConfig") {`
`106`	`106`	`compilerOpts(nativeFrameworkPaths.map { "-F$it" })`
`107`		`- extraOpts("-verbose")`
	`107`	`+ extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ kotlin {`
`95`	`95`	`compilations.getByName("main") {`
`96`	`96`	`cinterops.create("FirebaseDatabase") {`
`97`	`97`	`compilerOpts(nativeFrameworkPaths.map { "-F$it" })`
`98`		`- extraOpts("-verbose")`
	`98`	`+ extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ kotlin {`
`102`	`102`	`compilations.getByName("main") {`
`103`	`103`	`cinterops.create("FirebaseFirestore") {`
`104`	`104`	`compilerOpts(nativeFrameworkPaths.map { "-F$it" })`
`105`		`- extraOpts("-verbose")`
	`105`	`+ extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`