Merge Windows

touchlab · May 15, 2019 · 2fd4a84 · 2fd4a84
1 parent 6feeef8
commit 2fd4a84
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ captures/
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/artifacts
 
 # Keystore files
 *.jks

diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ kotlin.code.style=official
 KOTLIN_VERSION=1.3.30
 
 GROUP=co.touchlab
-VERSION_NAME=0.7.0
+VERSION_NAME=0.7.2
 
 POM_URL=https://github.com/touchlab/Stately
 POM_DESCRIPTION=Multithreaded Kotlin Multiplatform Utilities

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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/stately/build.gradle b/stately/build.gradle
@@ -43,7 +43,7 @@ kotlin {
             dependencies {
         		implementation 'org.jetbrains.kotlin:kotlin-test-common'
         		implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common'
-                implementation 'co.touchlab:testhelp:0.2.0'
+                implementation 'co.touchlab:testhelp:0.2.2'
             }
         }
         jvmMain {
@@ -135,7 +135,7 @@ kotlin {
         }
 
         mingwX64().compilations.test.defaultSourceSet {
-            dependsOn otherNativeTest
+            dependsOn mingwTest
         }
     }
 }