Merge branch 'presentation_compiler'

4 files changed, 20 insertions, 20 deletions

diff --git a/scripts/build.sh b/scripts/build.sh
index 559c330..2e6adf4 100644..100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,3 +1,18 @@
+#!/bin/bash
+
+# Installs locally
+# You will need java, maven, vsce, and visual studio code to run this script
+set -e
+
 export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
 
-mvn compile
\ No newline at end of file
+# Needed once
+npm install
+
+# Build fat jar
+mvn package -DskipTests
+
+# Build vsix
+vsce package -o build.vsix
+
+echo 'Install build.vsix using the extensions menu'
diff --git a/scripts/build.sh~HEAD b/scripts/build.sh~HEAD
new file mode 100644
index 0000000..559c330
--- /dev/null
+++ b/scripts/build.sh~HEAD
@@ -0,0 +1,3 @@
+export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
+
+mvn compile
\ No newline at end of file
diff --git a/scripts/format.sh b/scripts/format.sh
index b0e0a58..9e65263 100755
--- a/scripts/format.sh
+++ b/scripts/format.sh
@@ -6,7 +6,7 @@ root_dir="$(git rev-parse --show-toplevel)"
 
 # Path to jar
 jar_base_dir="git_hooks/"
-formatter_jar="${root_dir}/${jar_base_dir}/google-java-format-1.3-all-deps.jar"
+formatter_jar="${root_dir}/${jar_base_dir}/google-java-format-1.6-SNAPSHOT-all-deps.jar"
 formatter_cmd="java -jar ${formatter_jar}"
 
 # Format file in-place and use 4-space style (AOSP).
diff --git a/scripts/install.sh b/scripts/install.sh
deleted file mode 100755
index 578ea3d..0000000
--- a/scripts/install.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Installs locally
-# You will need java, maven, vsce, and visual studio code to run this script
-set -e
-
-export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
-
-# Needed once
-npm install
-
-# Build fat jar
-mvn package 
-
-# Build vsix
-vsce package -o build.vsix
-
-echo 'Install build.vsix using the extensions menu'