From 1cedf890b27dcd30281b1cea64911a34865d136d Mon Sep 17 00:00:00 2001 From: George Herbert Date: Thu, 5 Mar 2020 14:42:41 +0000 Subject: [PATCH] [HMA-2515] Upgrade to use Kotlin 1.3.70 (#3) --- build.gradle.kts | 19 ++----------------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 4 +--- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cf9c3d7..b4f167f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,7 @@ version = System.getenv("BITRISE_GIT_TAG") ?: ("SNAPSHOT-" + getDate()) plugins { `maven-publish` - kotlin("multiplatform").version("1.3.61") + kotlin("multiplatform").version("1.3.70") jacoco java id("com.github.dawnwords.jacoco.badge").version("0.1.0") @@ -93,7 +93,7 @@ kotlin { } sourceSets { - val klockVersion = "1.8.0" + val klockVersion = "1.9.0" val commonMain by getting { dependencies { implementation(kotlin("stdlib-common")) @@ -143,21 +143,6 @@ kotlin { } } - tasks.register("iosTest") { - group = project.name - val device = project.findProperty("iosDevice")?.toString() ?: "iPhone 8" - this.dependsOn(iosX64.binaries.getTest("DEBUG").linkTaskName) - group = JavaBasePlugin.VERIFICATION_GROUP - description = "Runs tests for target ios on an iOS simulator" - - doLast { - val binary = iosArm64.binaries.getTest("DEBUG").outputFile - exec { - commandLine(listOf("xcrun", "simctl", "spawn", device, binary.absolutePath)) - } - } - } - tasks.register("fatFramework") { group = project.name destinationDir = File(buildDir, "xcode-frameworks") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59b5f89..1b16c34 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-5.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 6074102..1f0fcb0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1 @@ -rootProject.name = "help-to-save-kalculator" - -enableFeaturePreview("GRADLE_METADATA") \ No newline at end of file +rootProject.name = "help-to-save-kalculator" \ No newline at end of file