Skip to content

Commit c998f97

Browse files
authored
Run build pipeline on both Windows, Ubuntu and Mac OS X (#431)
* Run build pipeline on both windows and ubuntu * Fix weird path issue in main class resolver on Windows * Add macos to build pipeline os list * Prettify code fix for Windows test failure
1 parent d8207f3 commit c998f97

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
12+
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15+
os: [ubuntu-latest, macos-latest, windows-latest]
1516
java: [ '11', '17' ]
1617
steps:
1718
- uses: actions/checkout@v3

server/src/main/kotlin/org/javacs/kt/resolve/ResolveMain.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.javacs.kt.resolve
22

3+
import java.io.File
34
import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
45
import org.jetbrains.kotlin.psi.KtFile
56
import org.jetbrains.kotlin.psi.KtNamedFunction
@@ -15,7 +16,7 @@ fun resolveMain(file: CompiledFile): Map<String,Any> {
1516

1617
findTopLevelMainFunction(parsedFile)?.let { mainFunction ->
1718
// the KtFiles name is weird. Full path. This causes the class to have full path in name as well. Correcting to top level only
18-
parsedFile.name = parsedFile.name.partitionAroundLast("/").second.substring(1)
19+
parsedFile.name = parsedFile.name.partitionAroundLast(File.separator).second.substring(1)
1920

2021
return mapOf(
2122
"mainClass" to JvmFileClassUtil.getFileClassInfoNoResolve(parsedFile).facadeClassFqName.asString(),

0 commit comments

Comments
 (0)