read version from git tag

FAForever · Oct 12, 2018 · 033ca71 · 033ca71
1 parent a77f068
commit 033ca71
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ jdk:
 - oraclejdk8
 install: true
 script:
-- gradle -b ice-adapter/build.gradle shadowJar -PtagVersion=`git describe --tags --abbrev=0`
+- gradle -b ice-adapter/build.gradle shadowJar -Pversion=${TRAVIS_TAG}
 - mv ./ice-adapter/build/libs/ice-adapter-*-all.jar ./faf-ice-adapter.jar
 deploy:
   provider: releases

diff --git a/ice-adapter/build.gradle b/ice-adapter/build.gradle
@@ -17,7 +17,7 @@ apply plugin: 'javafx-gradle-plugin'
 apply plugin: 'com.github.johnrengelman.plugin-shadow'
 
 group 'Geosearchef'
-
+version = 'SNAPSHOT'
 
 
 sourceCompatibility = 1.8
@@ -44,14 +44,4 @@ jar {
     manifest {
         attributes 'Main-Class': 'com.faforever.iceadapter.IceAdapter'
     }
-}
-
-task getTagVersion {
-    if (project.hasProperty("tagVersion")) {
-        project.setVersion(tagVersion)
-    }
-}
-
-shadowJar {
-    dependsOn getTagVersion
 }
diff --git a/ice-adapter/src/main/java/com/faforever/iceadapter/IceAdapter.java b/ice-adapter/src/main/java/com/faforever/iceadapter/IceAdapter.java
@@ -26,7 +26,7 @@ public class IceAdapter {
 
     public static volatile boolean running = true;
 
-    public static String VERSION = "snapshot";
+    public static String VERSION = "SNAPSHOT";
     public static String COMMAND_LINE_ARGUMENTS;
 
     public static int id = -1;

diff --git a/ice-adapter/src/main/java/com/faforever/iceadapter/util/CandidateUtil.java b/ice-adapter/src/main/java/com/faforever/iceadapter/util/CandidateUtil.java
@@ -34,7 +34,17 @@ public static CandidatesMessage packCandidates(int srcId, int destId, Agent agen
                 candidatePacket.setRelPort(localCandidate.getRelatedAddress().getPort());
             }
 
-            localCandidatesMessage.getCandidates().add(candidatePacket);
+            //Candidate type LOCAL and STUN can never occur as they are deprecated and not
+            if (IceAdapter.DEBUG_ALLOW_HOST && localCandidate.getType().equals(CandidateType.HOST_CANDIDATE)) {
+                localCandidatesMessage.getCandidates().add(candidatePacket);
+            }
+            if (IceAdapter.DEBUG_ALLOW_REFLEXIVE &&
+                    (localCandidate.getType().equals(CandidateType.SERVER_REFLEXIVE_CANDIDATE) || localCandidate.getType().equals(CandidateType.PEER_REFLEXIVE_CANDIDATE))) {
+                localCandidatesMessage.getCandidates().add(candidatePacket);
+            }
+            if (IceAdapter.DEBUG_ALLOW_RELAY && localCandidate.getType().equals(CandidateType.RELAYED_CANDIDATE)) {
+                localCandidatesMessage.getCandidates().add(candidatePacket);
+            }
         }
 
         return localCandidatesMessage;