Add clikt, build uber jar (#7)

* add clikt, build uber jar * graalvm no fallback * add test binary step in gh action
yujinyan · Apr 16, 2021 · fe2a632 · fe2a632
1 parent e82e0e5
commit fe2a632
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: CI
+name: Build
 
 # Controls when the action will run. 
 on:
@@ -38,6 +38,9 @@ jobs:
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
 
+      - name: Test Binary
+        run: build/graal/klisp -e "(+ 1 1)"
+
       # Runs a set of commands using the runners shell
       - uses: actions/upload-artifact@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,6 +14,13 @@ jobs:
         with:
           java-version: '11'
           distribution: 'adopt'
+      - name: Build Fat Jar
+        uses: eskatos/[email protected]
+        with:
+          arguments: shadowJar
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
       - name: Build GraalVM Native Image
         uses: eskatos/[email protected]
         with:
@@ -24,7 +31,9 @@ jobs:
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          files: build/graal/klisp
+          files: |
+            build/graal/klisp
+            build/libs/klisp.jar
           draft: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,11 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
+  application
   kotlin("jvm") version "1.4.32"
   id("com.palantir.graal") version "0.7.2"
+  id("com.github.johnrengelman.shadow") version "6.1.0"
 }
 
 group = "me.yujinyan"
@@ -19,10 +22,21 @@ tasks.withType<KotlinCompile>().configureEach {
   }
 }
 
+tasks.withType<ShadowJar>().configureEach {
+  archiveFileName.set("klisp.jar")
+}
+
+application {
+  // https://github.com/johnrengelman/shadow/pull/612
+  // mainClass.set("MainKt")
+  mainClassName = "MainKt"
+}
+
 graal {
   javaVersion("11")
   mainClass("MainKt")
   outputName("klisp")
+  option("--no-fallback")
 }
 
 repositories {
@@ -32,5 +46,6 @@ repositories {
 dependencies {
   testImplementation("io.kotest:kotest-runner-junit5:4.4.3")
   testImplementation("io.kotest:kotest-assertions-core:4.4.3")
+  implementation("com.github.ajalt.clikt:clikt:3.1.0")
   implementation(kotlin("stdlib"))
 }
diff --git a/src/main/kotlin/Cli.kt b/src/main/kotlin/Cli.kt
@@ -0,0 +1,16 @@
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.parameters.options.option
+
+class Cli : CliktCommand() {
+  private val expressionToEvaluate: String? by option("-e", "--evaluate", help = "evaluate expression")
+
+  override fun run() {
+    val env = DefaultEnv()
+    expressionToEvaluate?.let {
+      println(buildAst(it).evaluate(env))
+      return@run
+    }
+
+    repl()
+  }
+}
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
@@ -51,4 +51,4 @@ fun repl() {
   }
 }
 
-fun main() = repl()
+fun main(args: Array<String>) = Cli().main(args)
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,4 +51,4 @@ fun repl() { @@
       }
     }
-    fun main() = repl()
+    fun main(args: Array<String>) = Cli().main(args)