diff --git a/bugsnag-ios-link/src/main/kotlin/co/touchlab/crashkios/BugsnagLinkPlugin.kt b/bugsnag-ios-link/src/main/kotlin/co/touchlab/crashkios/BugsnagLinkPlugin.kt index 915eb2a..ed65287 100644 --- a/bugsnag-ios-link/src/main/kotlin/co/touchlab/crashkios/BugsnagLinkPlugin.kt +++ b/bugsnag-ios-link/src/main/kotlin/co/touchlab/crashkios/BugsnagLinkPlugin.kt @@ -16,12 +16,9 @@ package co.touchlab.crashkios import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.getByType -import org.jetbrains.kotlin.gradle.dsl.KotlinArtifactsExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeFrameworkConfig import org.jetbrains.kotlin.gradle.plugin.mpp.Framework import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget -import org.jetbrains.kotlin.gradle.targets.native.tasks.artifact.kotlinArtifactsExtension internal val Project.kotlinExtension: KotlinMultiplatformExtension get() = extensions.getByType() @@ -37,7 +34,6 @@ class BugsnagLinkPlugin : Plugin { "-U _OBJC_CLASS_\$_BugsnagError" afterEvaluate { project.kotlinExtension.crashLinkerConfig(linkerArgs) - project.kotlinArtifactsExtension.crashLinkerConfigArtifacts(linkerArgs) } } } @@ -48,17 +44,6 @@ private fun Project.withKotlinMultiplatformPlugin(action: Project.() -> Unit) { } } -private fun KotlinArtifactsExtension.crashLinkerConfigArtifacts(linkerOpts: String) { - artifactConfigs.withType(KotlinNativeFrameworkConfig::class.java).configureEach { - if (!isStatic) { - toolOptions { - freeCompilerArgs.add("-linker-options") - freeCompilerArgs.add(linkerOpts) - } - } - } -} - private fun KotlinMultiplatformExtension.crashLinkerConfig(linkerOpts: String) { targets.withType(KotlinNativeTarget::class.java).configureEach { val hasDynamicFrameworks = binaries.any { it is Framework && !it.isStatic } diff --git a/crashlytics-ios-link/src/main/kotlin/co/touchlab/crashkios/CrashlyticsLinkPlugin.kt b/crashlytics-ios-link/src/main/kotlin/co/touchlab/crashkios/CrashlyticsLinkPlugin.kt index a59ebc5..843fe72 100644 --- a/crashlytics-ios-link/src/main/kotlin/co/touchlab/crashkios/CrashlyticsLinkPlugin.kt +++ b/crashlytics-ios-link/src/main/kotlin/co/touchlab/crashkios/CrashlyticsLinkPlugin.kt @@ -16,12 +16,9 @@ package co.touchlab.crashkios import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.getByType -import org.jetbrains.kotlin.gradle.dsl.KotlinArtifactsExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension -import org.jetbrains.kotlin.gradle.dsl.KotlinNativeFrameworkConfig import org.jetbrains.kotlin.gradle.plugin.mpp.Framework import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget -import org.jetbrains.kotlin.gradle.targets.native.tasks.artifact.kotlinArtifactsExtension internal val Project.kotlinExtension: KotlinMultiplatformExtension get() = extensions.getByType() @@ -32,7 +29,6 @@ class CrashlyticsLinkPlugin : Plugin { val linkerArgs = "-U _FIRCLSExceptionRecordNSException" afterEvaluate { project.kotlinExtension.crashLinkerConfig(linkerArgs) - project.kotlinArtifactsExtension.crashLinkerConfigArtifacts(linkerArgs) } } } @@ -43,17 +39,6 @@ private fun Project.withKotlinMultiplatformPlugin(action: Project.() -> Unit) { } } -private fun KotlinArtifactsExtension.crashLinkerConfigArtifacts(linkerOpts: String) { - artifactConfigs.withType(KotlinNativeFrameworkConfig::class.java).configureEach { - if (!isStatic) { - toolOptions { - freeCompilerArgs.add("-linker-options") - freeCompilerArgs.add(linkerOpts) - } - } - } -} - private fun KotlinMultiplatformExtension.crashLinkerConfig(linkerOpts: String) { targets.withType(KotlinNativeTarget::class.java).configureEach { val hasDynamicFrameworks = binaries.any { it is Framework && !it.isStatic }