From 93396669b07c6c845828f2256346248bf8de1a5f Mon Sep 17 00:00:00 2001
From: jeremyjams <jeremy.toussaint@iex.ec>
Date: Thu, 21 Dec 2017 15:59:47 +0100
Subject: [PATCH] Added dynamic version

---
 build.gradle      | 13 +++++++------
 gradle.properties |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 22409d7a..e53c9e37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,8 +140,8 @@ task copyMiscToDist(type: Copy) {
 
     into("/lib") {
         from(build + '/libs')
-        include('xtremweb-11.5.0.jar')
-        rename('xtremweb-11.5.0.jar', 'xtremweb.jar')
+        include('xtremweb-' + version + '.jar')
+        rename('xtremweb-' + version + '.jar', 'xtremweb.jar')
     }
 }
 
@@ -399,7 +399,7 @@ task copyMacServer(type: Copy) {
 
     into("/Applications/xwhep.server/conf"){
         from templates + '/xtremweb.server.conf.in'
-        rename { fileName -> fileName.replace('xtremweb.client.server.in', 'xtremweb.server.conf') }
+        rename { fileName -> fileName.replace('xtremweb.server.conf.in', 'xtremweb.server.conf') }
         filter(ReplaceTokens, tokens: [LAUNCHERURL: 'http://nohost/',
                                        KEYDIR      : privateEtc + '/xwhep.server',
                                        DEFAULTUSER      : '',
@@ -412,9 +412,10 @@ task copyMacServer(type: Copy) {
     }
 
     into(privateEtc + "/xwhep.server/lib") {
-        from(libXtremWeb)
-        include('bcprov-jdk15on-151.jar')
-        include('bcpkix-jdk15on-151.jar')
+        from(dist + '/lib')
+        //include('bcprov-jdk15on-151.jar')
+        //include('bcpkix-jdk15on-151.jar')
+        //include('xtremweb.jar')
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index cc54381e..021bc8bf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=11.5.0
+version=12.0.1