From b95294b77ca6045e303e9302dfd4220022ebd7a1 Mon Sep 17 00:00:00 2001
From: Nadav Samet <thesamet@gmail.com>
Date: Thu, 1 Apr 2021 18:52:21 -0700
Subject: [PATCH] Fix use of nativeImage

See #1114
---
 .github/workflows/release.yml |  2 +-
 .travis/make_native_image.sh  | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100755 .travis/make_native_image.sh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d817946c..8555e91ee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -93,7 +93,7 @@ jobs:
         set -x
         gu install native-image
         ./make_reflect_config.sh
-        sbt protocGenScalaNativeImage/graalvm-native-image:packageBin
+        sbt protocGenScalaNativeImage/nativeImage
         zip -j $ASSET.zip target/protoc-gen-scala
 
     - uses: actions/upload-artifact@v2
diff --git a/.travis/make_native_image.sh b/.travis/make_native_image.sh
deleted file mode 100755
index 7923751fa..000000000
--- a/.travis/make_native_image.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -e
-wget -qO- https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh;
-GRAALVM=graalvm@19.2.0-1
-$JABBA_HOME/bin/jabba install ${GRAALVM}
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    export JAVA_HOME="$JABBA_HOME/jdk/${GRAALVM}/Contents/Home" && java -version
-else
-    export JAVA_HOME="$JABBA_HOME/jdk/${GRAALVM}" && java -version
-fi
-export PATH="$JAVA_HOME/bin:$PATH"
-gu install native-image
-./make_reflect_config.sh
-sbt protocGenScalaUnix/graalvm-native-image:packageBin
-zip -j $1 protocGenScalaUnix/target/graalvm-native-image/protoc-gen-scala