Import Jack and Jill Carnac 1.2-b2
Jack version: 292300 0a57a2e005387a5d3aeb99812f0e3a55388397f5
Jill version: 292300 0a57a2e005387a5d3aeb99812f0e3a55388397f5
Bugs fixed since 1.2-b1
Bug: 27807939
Bug: 27449084
Bug: 27326495
Bug: 22382563
Change-Id: Icd5627bc7ac4d9585da227544e100f44db40a667
diff --git a/tools/jack b/tools/jack
index fbd58c8..da49450 100755
--- a/tools/jack
+++ b/tools/jack
@@ -22,7 +22,7 @@
#
# Settings
#
-JACK_VERSION=${JACK_VERSION:=3.26.ALPHA}
+JACK_VERSION=${JACK_VERSION:=3.28.BETA}
JACK_HOME="${JACK_HOME:=$HOME/.jack-server}"
CLIENT_SETTING="${CLIENT_SETTING:=$HOME/.jack-settings}"
TMPDIR=${TMPDIR:=/tmp}
diff --git a/tools/jack-jacoco-reporter.jar b/tools/jack-jacoco-reporter.jar
index 1fbb882..a8d2ca1 100644
--- a/tools/jack-jacoco-reporter.jar
+++ b/tools/jack-jacoco-reporter.jar
Binary files differ
diff --git a/tools/jack_versions.mk b/tools/jack_versions.mk
index a579257..3521c0f 100644
--- a/tools/jack_versions.mk
+++ b/tools/jack_versions.mk
@@ -18,10 +18,10 @@
jack_jar_tools := $(LOCAL_PATH)/jack-jar-tools.jar
jack_eng_jar := $(LOCAL_PATH)/jacks/jack.jar
-JACK_STABLE_VERSION := 3.26.ALPHA
+JACK_STABLE_VERSION := 3.28.BETA
JACK_DOGFOOD_VERSION := 4.1.PRE_ALPHA
-JACK_SDKTOOL_VERSION := 3.27.BETA
-JACK_LANG_DEV_VERSION := 3.26.ALPHA
+JACK_SDKTOOL_VERSION := 3.28.BETA
+JACK_LANG_DEV_VERSION := 3.28.BETA
ifneq ("$(wildcard $(jack_eng_jar))","")
JACK_ENGINEERING_VERSION := $(shell java -jar $(jack_jar_tools) --version-code jack $(jack_eng_jar))
endif
diff --git a/tools/jacks/jack-3.26.ALPHA.jar b/tools/jacks/jack-3.28.BETA.jar
similarity index 62%
rename from tools/jacks/jack-3.26.ALPHA.jar
rename to tools/jacks/jack-3.28.BETA.jar
index 0045eb5..90f6d58 100644
--- a/tools/jacks/jack-3.26.ALPHA.jar
+++ b/tools/jacks/jack-3.28.BETA.jar
Binary files differ
diff --git a/tools/jills/jill-3.26.ALPHA.jar b/tools/jills/jill-3.28.BETA.jar
similarity index 63%
rename from tools/jills/jill-3.26.ALPHA.jar
rename to tools/jills/jill-3.28.BETA.jar
index fe1daa7..980a239 100644
--- a/tools/jills/jill-3.26.ALPHA.jar
+++ b/tools/jills/jill-3.28.BETA.jar
Binary files differ
