azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update samples to 1.4.0

Browse Source
This commit is contained in:
Sergey Bogolepov
2020-08-14 10:30:11 +07:00
committed by Sergey Bogolepov
parent a50efe69bb
commit 9fcffae786
7 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/androidNativeActivity/gradle.properties
+1 -1
View File
@@ -7,7 +7,7 @@ kotlin.code.style=official
# Pin Kotlin version: # Pin Kotlin version:
# CHANGE_VERSION_WITH_RELEASE # CHANGE_VERSION_WITH_RELEASE
kotlin_version=1.3.72 kotlin_version=1.4.0
# Use custom Kotlin/Native home: # Use custom Kotlin/Native home:
kotlin.native.home=../../dist kotlin.native.home=../../dist
samples/calculator/gradle.properties
+1 -1
View File
@@ -7,7 +7,7 @@ kotlin.code.style=official
# Pin Kotlin version: # Pin Kotlin version:
# CHANGE_VERSION_WITH_RELEASE # CHANGE_VERSION_WITH_RELEASE
kotlin_version=1.3.72 kotlin_version=1.4.0
# Use custom Kotlin/Native home: # Use custom Kotlin/Native home:
kotlin.native.home=../../../dist kotlin.native.home=../../../dist
samples/cocoapods/kotlin-library/gradle.properties
+1 -1
View File
@@ -7,7 +7,7 @@ kotlin.code.style=official
# Pin Kotlin version: # Pin Kotlin version:
# CHANGE_VERSION_WITH_RELEASE # CHANGE_VERSION_WITH_RELEASE
kotlin_version=1.3.72 kotlin_version=1.4.0
# Use custom Kotlin/Native home: # Use custom Kotlin/Native home:
kotlin.native.home=../../../dist kotlin.native.home=../../../dist
samples/coverage/build.gradle.kts
+2 -11
View File
@@ -6,17 +6,8 @@ plugins {
kotlin { kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting
dependencies { val commonTest by getting
implementation(kotlin("stdlib-common"))
}
}
val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
} }
// Determine host preset. // Determine host preset.
samples/gradle.properties
+1 -1
View File
@@ -6,7 +6,7 @@ kotlin.code.style=official
# Pin Kotlin version: # Pin Kotlin version:
# CHANGE_VERSION_WITH_RELEASE # CHANGE_VERSION_WITH_RELEASE
kotlin_version=1.3.72 kotlin_version=1.4.0
# Use custom Kotlin/Native home: # Use custom Kotlin/Native home:
kotlin.native.home=../../dist kotlin.native.home=../../dist
samples/uikit/build.gradle.kts
+2 -2
View File
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
plugins { plugins {
kotlin("multiplatform") // version "1.3.60-eap-23" apply true kotlin("multiplatform")
} }
allprojects { allprojects {
@@ -39,7 +39,7 @@ kotlin {
// We declare only one target (either arm64 or x64) // We declare only one target (either arm64 or x64)
// to workaround lack of common platform libraries // to workaround lack of common platform libraries
// for both device and simulator. // for both device and simulator.
val ios = if (!target.simulator ) { val ios = if (!target.simulator) {
// Device. // Device.
iosArm64("ios") iosArm64("ios")
} else { } else {
samples/watchos/build.gradle.kts
+1 -1
View File
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
plugins { plugins {
kotlin("multiplatform") // version "1.3.60-eap-23" apply true kotlin("multiplatform")
} }
allprojects { allprojects {