diff --git a/buildSrc/src/main/kotlin/android-library.gradle.kts b/buildSrc/src/main/kotlin/android-library.gradle.kts
index 3d610c8a9..b40a9101c 100644
--- a/buildSrc/src/main/kotlin/android-library.gradle.kts
+++ b/buildSrc/src/main/kotlin/android-library.gradle.kts
@@ -21,10 +21,8 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    libraryVariants.configureEach {
-        generateBuildConfigProvider?.configure {
-            enabled = false
-        }
+    buildFeatures {
+        buildConfig = false
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/multiplatform-library.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-library.gradle.kts
index 53fb8d44f..8a88c62e4 100644
--- a/buildSrc/src/main/kotlin/multiplatform-library.gradle.kts
+++ b/buildSrc/src/main/kotlin/multiplatform-library.gradle.kts
@@ -46,10 +46,6 @@ kotlin {
         }
     }
 
-    configure(darwinTargets) {
-        compilations["main"].kotlinOptions.freeCompilerArgs += "-Xobjc-generics"
-    }
-
     // Workaround for https://youtrack.jetbrains.com/issue/KT-36721
     targets.withType<KotlinNativeTarget>().configureEach {
         val moduleName = "${project.group}.${project.name}"