Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: russhwolf/multiplatform-settings
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8361999ba596a8d7048f05cd1002068a7e9335de
Choose a base ref
..
head repository: russhwolf/multiplatform-settings
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 46488549faca5aae3fba8aae1393f250730ed04c
Choose a head ref
Showing with 11 additions and 7 deletions.
  1. +9 −0 convention-plugins/src/main/kotlin/standard-configuration-without-android.gradle.kts
  2. +2 −7 multiplatform-settings/build.gradle.kts
9 changes: 9 additions & 0 deletions convention-plugins/src/main/kotlin/standard-configuration-without-android.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
import org.gradle.accessors.dm.LibrariesForLibs
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
@@ -40,6 +41,14 @@ kotlin {
// allWarningsAsErrors = true
// }
}

if (this is KotlinNativeTarget && this.name.startsWith("linux")) {
binaries.configureEach {
// lmdb appears to be using a newer gcc than Kotlin. This lets us still work as long as host has newer gcc too
// https://stackoverflow.com/a/78267398
linkerOpts += "--allow-shlib-undefined"
}
}
}

@OptIn(ExperimentalKotlinGradlePluginApi::class)
9 changes: 2 additions & 7 deletions multiplatform-settings/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl

/*
* Copyright 2019 Russell Wolf
*
@@ -17,7 +14,9 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
* limitations under the License.
*/

import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl

plugins {
id("standard-configuration")
@@ -31,10 +30,6 @@ standardConfig {
kotlin {
targets.getByName<KotlinNativeTarget>("linuxX64") {
compilations["main"].cinterops.create("lmdb")
binaries.configureEach {
// lmdb appears to be using a newer gcc than Kotlin. This lets us still work as long as host has newer gcc too
linkerOpts += "--allow-shlib-undefined"
}
}
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {