Merge pull request #5 from touchlab/sh/1.4.0

samhill303 · web-flow · commit 09ff938747c4 · 2020-08-18T12:24:05.000-04:00
Final Kotlin 1.4 update
diff --git a/build.gradle b/build.gradle
@@ -175,3 +175,4 @@ allprojects {
         }
     }
 }
+
diff --git a/gradle.properties b/gradle.properties
@@ -17,9 +17,8 @@
 kotlin.code.style=official
 
 GROUP=co.touchlab
-VERSION_NAME=0.3.8
-
-KOTLIN_VERSION=1.3.72
+VERSION_NAME=0.4.0
+KOTLIN_VERSION=1.4.0
 
 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
@@ -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
diff --git a/settings.gradle b/settings.gradle
@@ -16,4 +16,3 @@
 
 rootProject.name = 'testhelp'
 enableFeaturePreview('GRADLE_METADATA')
-enableFeaturePreview('STABLE_PUBLISHING')

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,3 @@`
`16`	`16`
`17`	`17`	`rootProject.name = 'testhelp'`
`18`	`18`	`enableFeaturePreview('GRADLE_METADATA')`
`19`		`-enableFeaturePreview('STABLE_PUBLISHING')`