From 644cf9167a79a397b7352f680bccce0bae9f2f62 Mon Sep 17 00:00:00 2001
From: Seth Goings <seth.goings@readytalk.com>
Date: Wed, 23 Jul 2014 16:36:19 -0600
Subject: [PATCH] Have Makefile pull version from gradle.properties

---
 build.gradle | 19 +++++++++++++++++++
 makefile     |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3d5facd94c..e2c3157e99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,6 +11,7 @@ buildscript {
 apply plugin: 'native-component'
 apply plugin: 'ivy-publish'
 apply plugin: 'com.jfrog.artifactory'
+apply plugin: 'java'
 
 artifactory {
   contextUrl = "http://oss.jfrog.org"
@@ -39,6 +40,24 @@ model {
   }
 }
 
+tasks.withType(JavaCompile) {
+  sourceCompatibility = "1.6"
+  targetCompatibility = "1.6"
+
+  options.encoding = "UTF-8"
+}
+
+sourceSets {
+  main {
+    java {
+      srcDir 'classpath'
+    }
+    resources {
+      srcDir 'classpath'
+    }
+  }
+}
+
 publishing {
   repositories {
     ivy {
diff --git a/makefile b/makefile
index 2a763ecb71..6d1b3477c8 100755
--- a/makefile
+++ b/makefile
@@ -1,7 +1,7 @@
 MAKEFLAGS = -s
 
 name = avian
-version = 1.0.2
+version := $(shell grep version gradle.properties | cut -d'=' -f2)
 
 build-arch := $(shell uname -m \
 	| sed 's/^i.86$$/i386/' \
@@ -1587,6 +1587,7 @@ $(classpath-build)/%.class: $(classpath-src)/%.java
 
 $(classpath-dep): $(classpath-sources) $(classpath-jar-dep)
 	@echo "compiling classpath classes"
+	@echo $(boot-classpath)
 	@mkdir -p $(classpath-build)
 	classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \
 		$(classpath-classes))"; if [ -n "$${classes}" ]; then \