mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-30 10:20:02 +00:00
[Kotlin] Update gradle to 7.4.1 and simplify config files. (#7231)
* [Kotlin] Update gradle to 7.4.1 and simplify config files. * [Kotlin] Add wrapper-validation-action to Kotlin Linux * [Kotlin] Remove benchmark actions to reduce CI time * [Kotlin] Move CI js test to Linux action, to increase Mac action speed * [Kotlin] Generate gradle wrapper in order to be validate Gradle wrapper from 3.3 to 4.0 are not verifiable because those files were dynamically generated by Gradle in a non-reproducible way. So they are now regenerated and will be checked using gitlab action: gradle/wrapper-validation-action@v1
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
kotlin("multiplatform") version "1.4.20"
|
||||
kotlin("multiplatform")
|
||||
}
|
||||
|
||||
group = "com.google.flatbuffers.kotlin"
|
||||
@@ -10,13 +10,13 @@ kotlin {
|
||||
jvm()
|
||||
js {
|
||||
browser {
|
||||
binaries.executable()
|
||||
testTask {
|
||||
testTask {
|
||||
useKarma {
|
||||
useChromeHeadless()
|
||||
}
|
||||
}
|
||||
}
|
||||
binaries.executable()
|
||||
}
|
||||
macosX64()
|
||||
iosArm32()
|
||||
@@ -32,8 +32,7 @@ kotlin {
|
||||
|
||||
val commonTest by getting {
|
||||
dependencies {
|
||||
implementation(kotlin("test-common"))
|
||||
implementation(kotlin("test-annotations-common"))
|
||||
implementation(kotlin("test"))
|
||||
}
|
||||
}
|
||||
val jvmTest by getting {
|
||||
@@ -43,9 +42,6 @@ kotlin {
|
||||
}
|
||||
val jvmMain by getting {
|
||||
kotlin.srcDir("java")
|
||||
dependencies {
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1")
|
||||
}
|
||||
}
|
||||
|
||||
val jsMain by getting {
|
||||
@@ -79,19 +75,12 @@ kotlin {
|
||||
|
||||
all {
|
||||
languageSettings.enableLanguageFeature("InlineClasses")
|
||||
languageSettings.useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes")
|
||||
languageSettings.optIn("kotlin.ExperimentalUnsignedTypes")
|
||||
}
|
||||
}
|
||||
|
||||
/* Targets configuration omitted.
|
||||
* To find out how to configure the targets, please follow the link:
|
||||
* https://kotlinlang.org/docs/reference/building-mpp-with-gradle.html#setting-up-targets */
|
||||
targets {
|
||||
targetFromPreset(presets.getAt("jvm"))
|
||||
targetFromPreset(presets.getAt("js"))
|
||||
targetFromPreset(presets.getAt("macosX64"))
|
||||
targetFromPreset(presets.getAt("iosArm32"))
|
||||
targetFromPreset(presets.getAt("iosArm64"))
|
||||
targetFromPreset(presets.getAt("iosX64"))
|
||||
}
|
||||
}
|
||||
|
||||
// Fixes JS issue: https://youtrack.jetbrains.com/issue/KT-49109
|
||||
rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
|
||||
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user