fix: more robust readXcodeMajorVersion

kalinjul · ttypic · commit ba6b0cc75f1f · 2023-11-24T21:57:01.000Z
diff --git a/plugin/src/main/kotlin/io/github/ttypic/swiftklib/gradle/task/CompileSwiftTask.kt b/plugin/src/main/kotlin/io/github/ttypic/swiftklib/gradle/task/CompileSwiftTask.kt
@@ -178,7 +178,7 @@ open class CompileSwiftTask @Inject constructor(
         }
 
         val output = stdout.toString().trim()
-        val (_, majorVersion) = "Xcode (\\d+)\\.\\d+\\.\\d+".toRegex().find(output)?.groupValues
+        val (_, majorVersion) = "Xcode (\\d+)\\..*".toRegex().find(output)?.groupValues
             ?: throw IllegalStateException("Can't find Xcode")
 
         return majorVersion.toInt()

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ open class CompileSwiftTask @Inject constructor(`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`val output = stdout.toString().trim()`
`181`		`- val (_, majorVersion) = "Xcode (\\d+)\\.\\d+\\.\\d+".toRegex().find(output)?.groupValues`
	`181`	`+ val (_, majorVersion) = "Xcode (\\d+)\\..*".toRegex().find(output)?.groupValues`
`182`	`182`	`?: throw IllegalStateException("Can't find Xcode")`
`183`	`183`
`184`	`184`	`return majorVersion.toInt()`