Adjust matcher

Author: sarahchen6

gradle/java_no_deps.gradle

@@ -151,11 +151,16 @@ project.afterEvaluate {
   def testJvm = gradle.startParameter.projectProperties["testJvm"]
   def javaTestLauncher = null as Provider<JavaLauncher>
   if (testJvm) {
-    def matcher = testJvm =~ /([a-zA-Z]*)([0-9]+)/
+    def matcher = testJvm =~ /([a-zA-Z]*)([0-9]*)/
     if (!matcher.matches()) {
-      throw new GradleException("Unable to find launcher for Java '$testJvm'. It needs to match '([a-zA-Z]*)([0-9]+)'.")
+      throw new GradleException("Unable to find launcher for Java '$testJvm'. It needs to match '([a-zA-Z]*)([0-9]*)'.")
+    }
+    def testJvmLanguageVersion = null
+    if (matcher.group(2) ==~ /\d+/) {
+      testJvmLanguageVersion = matcher.group(2) as Integer
+    } else {
+      testJvmLanguageVersion = matcher.group(2)
     }
-    def testJvmLanguageVersion = matcher.group(2) as Integer
     def testJvmEnv = "JAVA_${testJvm}_HOME"
     def testJvmHome = System.getenv(testJvmEnv)
     if (!testJvmHome) {