From ea8813bade235e31880c66b0e9e69bdbdda323f4 Mon Sep 17 00:00:00 2001
From: Tal Moran <talm@idc.ac.il>
Date: Wed, 21 Jun 2017 17:28:07 +0300
Subject: [PATCH] Updated voting-booth-gui build script to work without local
 nexus repository

---
 voting-booth-gui/VotersBallot.png | Bin 973 -> 0 bytes
 voting-booth-gui/build.gradle     |  94 ++++++++++++------------------
 2 files changed, 38 insertions(+), 56 deletions(-)
 delete mode 100644 voting-booth-gui/VotersBallot.png

diff --git a/voting-booth-gui/VotersBallot.png b/voting-booth-gui/VotersBallot.png
deleted file mode 100644
index e1e48dd0c97cb412dcad3d4203d328fafd80fb10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 973
zcmW-gPe@cz6vmIZ327pR7E^%<ji4?{IN-{ph7lc!L1k7}Gz6VZvq=a>f(gnXZDSDP
zAxWCb3}S*9T1bD4z|{%U)gWjaBN#9S3KwCWzWeUtG3VWTzw`UPGjD1*I}mF*)<Q(F
z%wT$ysA&kllLwmdtd;J(Bx<JN^SOSML`)<^N@PSHDrRCKR$?ReuqjL;BuZi=9?mM0
z3aOGBsfVk^WJ0E7M&?i=XL2D|awA6pZAe24mvP!dpRj~knT^>)TT~(}%3>@YD6px*
zs;tK90SaeL*p$uK9E`ZiF6_!~?C1(=hyfauz``CHLmSf2!etMJLXD*&CgQ;#+M-ew
zHBk?CL4i$EF%xsR2NceVtGJ279`XPtZX*u(2Lv2~8e)J3C60mvjiC)`Xn9C3Y@^09
zRS!YJAKIcaQ*-1ByP&|Px~U^aB#i*Th2sbsZV@H&048oD4luzm9D*8RfW}Q=fdh@9
z4QUS}3a7D+8p|;;1POm=i^|-?0Hg5-ifE!?p3#s3RFr!dZxm%<jM53yjtmFn$U_)@
zgcTe_ogj_B1Ez%V;0dkb@pvMUXl-pxCX-!VUEST?Jv}|Wy}hYaYH)Bco6Y8Oxv{aa
zd_Iq96$*v%@$q7@SSpn!Cnu+;r)OqnW@l&T=jY4i^3u{$rBbO@tINyFD=RCjtE;fL
zv9VFB)wZ{{cXoE_^?IYx*xTFN-`{WRyz&`ez`acRT&}pe`}I?7vhDEMk?Qe3r)6_J
zvEKA<uGnal-kdu0;L^AF)ymI>+Ux7Do<4ee<KyMEiHkQU&OGkUp8P9)-@jD1w*1-R
zwWA*v7I$~+zYCcc13zXi-0y2?A9~nvH;!j&D*k-9oSqu(7%3mY%aO2!m+eDOqL=^P
Y#}5ALJaMZ!w-!FjOn)|AN#$?<2YAiW!~g&Q

diff --git a/voting-booth-gui/build.gradle b/voting-booth-gui/build.gradle
index a1e239a..61638c6 100644
--- a/voting-booth-gui/build.gradle
+++ b/voting-booth-gui/build.gradle
@@ -14,19 +14,18 @@ apply plugin: 'maven-publish'
 // (this will also allow you to build a "fatCapsule" which includes
 // the entire application, including all dependencies in a single jar)
 apply plugin: 'application'
-mainClassName='meerkat.voting.gui.Main'
+mainClassName='meerkat.voting.gui.VotingBoothToyGraphicalRun'
 
 // Is this a snapshot version?
-ext { isSnapshot = false } 
+ext { isSnapshot = false }
 
 ext {
-        groupId = 'org.factcenter.meerkat'
-        nexusRepository = "https://cs.idc.ac.il/nexus/content/groups/${isSnapshot ? 'unstable' : 'public'}/"
-        
-        // Credentials for IDC nexus repositories (needed only for using unstable repositories and publishing)
-        // Should be set in ${HOME}/.gradle/gradle.properties
-        nexusUser =  project.hasProperty('nexusUser') ? project.property('nexusUser') : ""
-        nexusPassword = project.hasProperty('nexusPassword') ? project.property('nexusPassword') : ""
+    groupId = 'org.factcenter.meerkat'
+
+    // Credentials for publishing repositories
+    publishRepository = "https://cs.idc.ac.il/nexus/content/repositories/${project.isSnapshot ? 'snapshots' : 'releases'}"
+    publishUser =  project.hasProperty('publishUser') ? project.property('publishUser') : ""
+    publishPassword = project.hasProperty('publishPassword') ? project.property('publishPassword') : ""
 }
 
 description = "GUI for voting booth"
@@ -35,12 +34,12 @@ description = "GUI for voting booth"
 version = "0.1"
 
 version += "${isSnapshot ? '-SNAPSHOT' : ''}"
-
-repositories {
-    flatDir {
-        dirs '/src/main/resources/jars'
-    }
-}
+//
+//repositories {
+//    flatDir {
+//        dirs '/src/main/resources/jars'
+//    }
+//}
 
 dependencies {
     // Meerkat common
@@ -138,10 +137,7 @@ idea {
 /*===================================
  *        "Fat" Build targets
  *===================================*/
- 
-task printProps << {
-    println fatmain
-}
+
 
 if (project.hasProperty('mainClassName') && (mainClassName != null)) {
 
@@ -156,19 +152,17 @@ if (project.hasProperty('mainClassName') && (mainClassName != null)) {
 
         destinationDir = buildDir
 
-        def fatMain
-        
-        if (this.hasProperty('fatmain')) {
-            fatMain = fatmain 
-            appendix = "fat-${fatMain}"
-        } else {
-            fatMain = mainClassName
-            appendix = "fat"
-        }
+        def fatMain = hasProperty('fatmain') ? fatmain : mainClassName
 
         applicationClass fatMain
 
-        def testJar = this.hasProperty('test')
+        def testJar = hasProperty('test')
+
+        if (hasProperty('fatmain')) {
+            appendix = "fat-${fatMain}"
+        } else {
+            appendix = "fat"
+        }
 
         if (testJar) {
             from sourceSets.test.output
@@ -176,45 +170,32 @@ if (project.hasProperty('mainClassName') && (mainClassName != null)) {
     }
 }
 
-
 /*===================================
  *        Repositories
  *===================================*/
 
 repositories {
-        
-        // Prefer the local nexus repository (it may have 3rd party artifacts not found in mavenCentral)
-        maven { 
-            url nexusRepository
-            
-            if (isSnapshot) {
-                credentials { username 
-                    password 
+    // Use local maven repository
+    mavenLocal()
 
-                    username nexusUser
-                    password nexusPassword 
-                }
-            }
-        }
-
-        // Use local maven repository
-        mavenLocal()
-
-        // Use 'maven central' for other dependencies.
-        mavenCentral()
+    // Use 'maven central' for other dependencies.
+    mavenCentral()
 }
 
-task "info" << {
+task "info"  {
+    doLast {
         println "Project: ${project.name}"
-println "Description: ${project.description}"
+        println "Description: ${project.description}"
         println "--------------------------"
         println "GroupId: $groupId"
         println "Version: $version (${isSnapshot ? 'snapshot' : 'release'})"
         println ""
+    }
 }
 info.description 'Print some information about project parameters'
 
 
+
 /*===================================
  *        Publishing
  *===================================*/
@@ -232,12 +213,12 @@ publishing {
     }
     repositories {
         maven {
-            url "https://cs.idc.ac.il/nexus/content/repositories/${project.isSnapshot ? 'snapshots' : 'releases'}"
-            credentials { username 
-                password 
+            url publishRepository
+            credentials { username
+                password
 
-                username nexusUser
-                password nexusPassword 
+                username publishUser
+                password publishPassword
             }
         }
     }
@@ -245,3 +226,4 @@ publishing {
 
 
 
+