diff --git a/build.gradle.kts b/build.gradle.kts index c46c13c4..7e171861 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,34 +1,33 @@ import org.apache.tools.ant.taskdefs.condition.Os -group = "dev.gitlive" -version = "5.0.0" - plugins { `maven-publish` signing - kotlin("native.cocoapods") version "1.4.10" - kotlin("multiplatform") version "1.4.10" + kotlin("multiplatform") version "1.4.30-M1" } +group = "dev.gitlive" +version = "5.0.0" + repositories { mavenLocal() google() jcenter() - maven(url = "https://dl.bintray.com/kotlin/kotlin-dev") } kotlin { jvm { - val main by compilations.getting { - kotlinOptions { - jvmTarget = "1.8" - } - + compilations.all { + kotlinOptions.jvmTarget = "1.8" + } + testRuns["test"].executionTask.configure { + useJUnit() } } - js { - val main by compilations.getting { + js(LEGACY) { + nodejs() + compilations.all { kotlinOptions { sourceMap = true sourceMapEmbedSources = "always" @@ -37,9 +36,6 @@ kotlin { } } - iosArm64() - iosX64() - sourceSets { val commonMain by getting { dependencies { diff --git a/gradle.properties b/gradle.properties index 626fc37a..3b02d0ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,4 @@ -kotlin_version = 1.3.72 -kotlin.incremental.multiplatform=true \ No newline at end of file +kotlin.code.style=official +kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.native.enableDependencyPropagation=false +kotlin.js.generate.executable.default=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac33e994..be52383e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index ad4a09d5..d0fd497a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,21 +1 @@ -enableFeaturePreview("GRADLE_METADATA") - -pluginManagement { - repositories { - gradlePluginPortal() - jcenter() - google() - maven("https://dl.bintray.com/kotlin/kotlin-eap") - } - resolutionStrategy { - val kotlin_version: String by settings - eachPlugin { - when { - requested.id.id == "org.jetbrains.kotlin.native.cocoapods" || requested.id.id == "kotlin-native-cocoapods" -> - useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") - requested.id.id.startsWith("org.jetbrains.kotlin") -> - useVersion(kotlin_version) - } - } - } -} \ No newline at end of file +rootProject.name = "kotlin-diff-utils"