Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -37,9 +36,6 @@ kotlin {
}
}

iosArm64()
iosX64()

sourceSets {
val commonMain by getting {
dependencies {
Expand Down
6 changes: 4 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
kotlin_version = 1.3.72
kotlin.incremental.multiplatform=true
kotlin.code.style=official
kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false
kotlin.js.generate.executable.default=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
22 changes: 1 addition & 21 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -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)
}
}
}
}
rootProject.name = "kotlin-diff-utils"