Skip to content

Commit 9eccf73

Browse files
rachelcarmenatschuchortdev
authored andcommitted
Regex: consideration of other details after major.minor.patch versions
1 parent f27c3c7 commit 9eccf73

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/main/kotlin/com/tschuchort/compiletesting/KotlinCompilation.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ class KotlinCompilation {
232232
*/
233233
var kotlinStdLibJar: File? by default {
234234
findInHostClasspath(hostClasspaths, "kotlin-stdlib.jar",
235-
Regex("(kotlin-stdlib|kotlin-runtime)(-[0-9]+\\.[0-9]+\\.[0-9]+)\\.jar"))
235+
Regex("(kotlin-stdlib|kotlin-runtime)(-[0-9]+\\.[0-9]+\\.[0-9]+)([-0-9a-zA-Z]+)?\\.jar"))
236236
}
237237

238238
/**
@@ -242,7 +242,7 @@ class KotlinCompilation {
242242
*/
243243
var kotlinStdLibJdkJar: File? by default {
244244
findInHostClasspath(hostClasspaths, "kotlin-stdlib-jdk*.jar",
245-
Regex("kotlin-stdlib-jdk[0-9]+(-[0-9]+\\.[0-9]+\\.[0-9]+)\\.jar"))
245+
Regex("kotlin-stdlib-jdk[0-9]+(-[0-9]+\\.[0-9]+\\.[0-9]+)([-0-9a-zA-Z]+)?\\.jar"))
246246
}
247247

248248
/**
@@ -252,7 +252,7 @@ class KotlinCompilation {
252252
*/
253253
var kotlinReflectJar: File? by default {
254254
findInHostClasspath(hostClasspaths, "kotlin-reflect.jar",
255-
Regex("kotlin-reflect(-[0-9]+\\.[0-9]+\\.[0-9]+)\\.jar"))
255+
Regex("kotlin-reflect(-[0-9]+\\.[0-9]+\\.[0-9]+)([-0-9a-zA-Z]+)?\\.jar"))
256256
}
257257

258258
/**
@@ -262,7 +262,7 @@ class KotlinCompilation {
262262
*/
263263
var kotlinScriptRuntimeJar: File? by default {
264264
findInHostClasspath(hostClasspaths, "kotlin-script-runtime.jar",
265-
Regex("kotlin-script-runtime(-[0-9]+\\.[0-9]+\\.[0-9]+)\\.jar"))
265+
Regex("kotlin-script-runtime(-[0-9]+\\.[0-9]+\\.[0-9]+)([-0-9a-zA-Z]+)?\\.jar"))
266266
}
267267

268268
/**
@@ -272,7 +272,7 @@ class KotlinCompilation {
272272
*/
273273
var kotlinStdLibCommonJar: File? by default {
274274
findInHostClasspath(hostClasspaths, "kotlin-stdlib-common.jar",
275-
Regex("kotlin-stdlib-common(-[0-9]+\\.[0-9]+\\.[0-9]+)\\.jar"))
275+
Regex("kotlin-stdlib-common(-[0-9]+\\.[0-9]+\\.[0-9]+)([-0-9a-zA-Z]+)?\\.jar"))
276276
}
277277

278278
/**

0 commit comments

Comments
 (0)