From 82dafb5357b7140fdb7834be06152bf8976ff9b3 Mon Sep 17 00:00:00 2001 From: Sam Hill Date: Tue, 2 Jun 2020 15:51:41 -0400 Subject: [PATCH 1/5] Preview 1.4 --- azure-pipelines-deploy.yml | 1 + build.gradle | 4 ++-- gradle.properties | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/azure-pipelines-deploy.yml b/azure-pipelines-deploy.yml index d7ec36b..ab827b1 100644 --- a/azure-pipelines-deploy.yml +++ b/azure-pipelines-deploy.yml @@ -1,4 +1,5 @@ trigger: none +pr: none jobs: - job: "macOS" diff --git a/build.gradle b/build.gradle index 8bebe97..a560c19 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { jcenter() google() gradlePluginPortal() -// maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { @@ -31,7 +31,7 @@ apply plugin: 'org.jetbrains.kotlin.multiplatform' repositories { mavenCentral() -// maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } group = GROUP diff --git a/gradle.properties b/gradle.properties index 9afda72..5bae317 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,9 +17,9 @@ kotlin.code.style=official GROUP=co.touchlab -VERSION_NAME=0.3.8 +VERSION_NAME=0.3.8-1.4-M1 -KOTLIN_VERSION=1.3.72 +KOTLIN_VERSION=1.4-M1 POM_URL=https://github.com/touchlab/TestHelp POM_DESCRIPTION=Kotlin Multiplatform Test Help From 4d1d6a38a9ce55e24e704f5715bd4c535d30e2d2 Mon Sep 17 00:00:00 2001 From: Sam Hill Date: Thu, 4 Jun 2020 15:08:02 -0400 Subject: [PATCH 2/5] 1.4 M2 Preview --- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5bae317..49372da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,9 +17,9 @@ kotlin.code.style=official GROUP=co.touchlab -VERSION_NAME=0.3.8-1.4-M1 +VERSION_NAME=0.3.8-1.4-M2 -KOTLIN_VERSION=1.4-M1 +KOTLIN_VERSION=1.4-M2 POM_URL=https://github.com/touchlab/TestHelp POM_DESCRIPTION=Kotlin Multiplatform Test Help diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8626824..b4e26f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -16,6 +16,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index da76481..55d5ba7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,4 +16,3 @@ rootProject.name = 'testhelp' enableFeaturePreview('GRADLE_METADATA') -enableFeaturePreview('STABLE_PUBLISHING') From c87cd551874ed3300e139fc202a705fff8e9687e Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 8 Jul 2020 13:32:41 -0400 Subject: [PATCH 3/5] 1.4 M3 Preview --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 49372da..16d51ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,9 +17,9 @@ kotlin.code.style=official GROUP=co.touchlab -VERSION_NAME=0.3.8-1.4-M2 +VERSION_NAME=0.3.8-1.4-M3 -KOTLIN_VERSION=1.4-M2 +KOTLIN_VERSION=1.4-M3 POM_URL=https://github.com/touchlab/TestHelp POM_DESCRIPTION=Kotlin Multiplatform Test Help From 8bc685fa76b162c099d5be41f65e81b38c64a063 Mon Sep 17 00:00:00 2001 From: russell Date: Mon, 27 Jul 2020 13:56:01 -0400 Subject: [PATCH 4/5] 1.4-0-rc --- gradle.properties | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 16d51ed..c42ab63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,9 +17,8 @@ kotlin.code.style=official GROUP=co.touchlab -VERSION_NAME=0.3.8-1.4-M3 - -KOTLIN_VERSION=1.4-M3 +VERSION_NAME=0.3.8-1.4.0-rc +KOTLIN_VERSION=1.4.0-rc POM_URL=https://github.com/touchlab/TestHelp POM_DESCRIPTION=Kotlin Multiplatform Test Help From a558c7df16428f3904dccf360b5580e0b94f8338 Mon Sep 17 00:00:00 2001 From: Sam Hill Date: Tue, 18 Aug 2020 11:45:36 -0400 Subject: [PATCH 5/5] Update for final kotlin 1.4 --- build.gradle | 2 -- gradle.properties | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5c1c6d5..4273a61 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,6 @@ buildscript { jcenter() google() gradlePluginPortal() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { @@ -32,7 +31,6 @@ apply plugin: 'org.jetbrains.kotlin.multiplatform' repositories { mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } } group = GROUP diff --git a/gradle.properties b/gradle.properties index c42ab63..9945c05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,8 +17,8 @@ kotlin.code.style=official GROUP=co.touchlab -VERSION_NAME=0.3.8-1.4.0-rc -KOTLIN_VERSION=1.4.0-rc +VERSION_NAME=0.4.0 +KOTLIN_VERSION=1.4.0 POM_URL=https://github.com/touchlab/TestHelp POM_DESCRIPTION=Kotlin Multiplatform Test Help