Merge pull request #28 from Kotlin/fix_iosTest_xcode11

artdfel · web-flow · commit 06fcc6fe7b05 · 2019-11-28T16:08:40.000+03:00
Updated several things to the latest versions
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     // KOTLIN_VERSION
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.61'
 
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 22 10:27:43 MSK 2019
+#Thu Nov 28 14:56:59 MSK 2019
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/greeting/build.gradle b/greeting/build.gradle
@@ -93,7 +93,7 @@ task iosTest {
     doLast {
         def binary = kotlin.targets.ios.binaries.getTest('DEBUG').outputFile
         exec {
-            commandLine 'xcrun', 'simctl', 'spawn', device, binary.absolutePath
+            commandLine 'xcrun', 'simctl', 'spawn',  '--standalone', device, binary.absolutePath
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`// KOTLIN_VERSION`
`3`		`- ext.kotlin_version = '1.3.41'`
	`3`	`+ ext.kotlin_version = '1.3.61'`
`4`	`4`
`5`	`5`	`repositories {`
`6`	`6`	`google()`
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }`
`10`	`10`	`}`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:3.4.0'`
	`12`	`+ classpath 'com.android.tools.build:gradle:3.5.2'`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ task iosTest {`
`93`	`93`	`doLast {`
`94`	`94`	`def binary = kotlin.targets.ios.binaries.getTest('DEBUG').outputFile`
`95`	`95`	`exec {`
`96`		`- commandLine 'xcrun', 'simctl', 'spawn', device, binary.absolutePath`
	`96`	`+ commandLine 'xcrun', 'simctl', 'spawn', '--standalone', device, binary.absolutePath`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`