Fixes for tests

Signed-off-by: Marcin Kuszczak <[email protected]>

Author: aartiPl

src/main/kotlin/io/github/kscripting/kscript/creator/JarArtifactCreator.kt

@@ -11,19 +11,9 @@ data class JarArtifact(val path: OsPath, val execClassName: String)
 class JarArtifactCreator(private val executor: Executor) {
 
     fun create(basePath: OsPath, script: Script, resolvedDependencies: Set<OsPath>): JarArtifact {
-        // Capitalize first letter and get rid of dashes (since this is what kotlin compiler is doing for the wrapper to create a valid java class name)
-        // For valid characters see https://stackoverflow.com/questions/4814040/allowed-characters-in-filename
-        val className =
-            script.scriptLocation.scriptName.replace("[^A-Za-z0-9]".toRegex(), "_").replaceFirstChar { it.titlecase() }
-                // also make sure that it is a valid identifier by avoiding an initial digit (to stay in sync with what the kotlin script compiler will do as well)
-                .let { if ("^[0-9]".toRegex().containsMatchIn(it)) "_$it" else it }
-
-        // Define the entrypoint for the scriptlet jar
         val execClassName = "${script.entryPoint.value}Kt"
-
-
         val jarFile = basePath.resolve("scriplet.jar")
-        val scriptFile = basePath.resolve("$className.kt")
+        val scriptFile = basePath.resolve("Scriplet.kt")
         val execClassNameFile = basePath.resolve("scripletExecClassName.txt")
 
         execClassNameFile.writeText(execClassName)

src/main/kotlin/io/github/kscripting/kscript/resolver/ScriptResolver.kt

@@ -158,7 +158,7 @@ class ScriptResolver(
         resolutionContext.scriptNodes.add(scriptNode)
 
         resolutionContext.packageName = resolutionContext.packageName ?: PackageName("kscript.scriplet")
-        resolutionContext.entryPoint = resolutionContext.entryPoint ?: Entry("${resolutionContext.packageName!!.value}.${scriptLocation.scriptName}")
+        resolutionContext.entryPoint = resolutionContext.entryPoint ?: Entry("${resolutionContext.packageName!!.value}.Scriplet")
 
         val code = ScriptUtils.resolveCode(resolutionContext.packageName, resolutionContext.importNames, scriptNode)