Bump to 1.6.10

This commit is contained in:
Ugljesa Jovanovic committed 2022-01-15 21:59:14 +01:00
1 parent 498dd87c5d
commit 3c5e91d8c9
4 files changed
+4503 -18

No files matched your search

+1 -1
View File
@@ -28,7 +28,7 @@ repositories {
} }
dependencies { dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
implementation("com.android.tools.build:gradle:4.0.2") implementation("com.android.tools.build:gradle:4.0.2")
} }
+4 -4
View File
@@ -15,10 +15,10 @@
*/ */
object Versions { object Versions {
val kotlinCoroutines = "1.5.2-native-mt" val kotlinCoroutines = "1.6.0-native-mt"
val kotlin = "1.5.31" val kotlin = "1.6.10"
val kotlinSerialization = "1.3.0-RC" val kotlinSerialization = "1.3.2"
val kotlinSerializationPlugin = "1.5.31" val kotlinSerializationPlugin = kotlin
val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build
val nodePlugin = "1.3.0" val nodePlugin = "1.3.0"
val dokkaPlugin = "1.5.0" val dokkaPlugin = "1.5.0"
File diff suppressed because it is too large. Load diff
@@ -252,21 +252,23 @@ kotlin {
} }
} }
println("Configuring Mingw targets") if (hostOsName == "windows") {
mingwX64() { println("Configuring Mingw targets")
binaries { mingwX64() {
staticLib { binaries {
optimized = true staticLib {
optimized = true
}
} }
} compilations.getByName("main") {
compilations.getByName("main") { val libsodiumCinterop by cinterops.creating {
val libsodiumCinterop by cinterops.creating { defFile(projectRef.file("src/nativeInterop/cinterop/libsodium.def"))
defFile(projectRef.file("src/nativeInterop/cinterop/libsodium.def")) compilerOpts.add("-I${projectRef.rootDir}/sodiumWrapper/static-mingw-x86-64/include")
compilerOpts.add("-I${projectRef.rootDir}/sodiumWrapper/static-mingw-x86-64/include") }
kotlinOptions.freeCompilerArgs = listOf(
"-include-binary", "${projectRef.rootDir}/sodiumWrapper/static-mingw-x86-64/lib/libsodium.a"
)
} }
kotlinOptions.freeCompilerArgs = listOf(
"-include-binary", "${projectRef.rootDir}/sodiumWrapper/static-mingw-x86-64/lib/libsodium.a"
)
} }
} }