simplified version check.

Author: subwiz

build.gradle

@@ -13,4 +13,7 @@ allprojects {
   tasks.withType(JavaCompile) {
     options.compilerArgs << '-Xlint:deprecation' << '-Xlint:unchecked'
   }
+  repositories {
+    maven { url "https://jitpack.io" }
+  }
 }

restclient-lib/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     'org.apache.httpcomponents:httpmime:4.5.2',
     'org.codehaus.groovy:groovy-all:2.4.4',
     'net.htmlparser.jericho:jericho-html:3.4',
-    'org.wiztools:app-update:0.2.0'
+    'com.github.wiztools:app-update-framework:app-update-0.2.1'
   compile('com.io7m.xom:xom:1.2.10') {
     exclude group: 'xerces', module: 'xmlParserAPIs'
     exclude group: 'xerces', module: 'xercesImpl'

restclient-lib/src/main/java/org/wiztools/restclient/Versions.java

@@ -1,6 +1,7 @@
 package org.wiztools.restclient;
 
-import java.util.Arrays;
+import org.wiztools.appupdate.Version;
+import org.wiztools.appupdate.VersionImpl;
 
 /**
  *
@@ -9,32 +10,23 @@
 public final class Versions {
     public static final String CURRENT = "3.6";
 
-    private static final String[] VERSIONS = new String[]{
-        "3.0", "3.1", "3.2", "3.2.1", "3.2.2", "3.2.3", "3.3", "3.3.1", "3.4",
-        "3.4.1", "3.4.2", "3.5", CURRENT
-    };
-    
-    static {
-        // Sort the version array for binary search
-        Arrays.sort(VERSIONS);
-    }
+    private static final Version MIN = new VersionImpl("3.0");
+    private static final Version MAX = new VersionImpl(CURRENT);
 
     public static void versionValidCheck(final String restVersion)
             throws VersionValidationException {
         if (restVersion == null) {
             throw new VersionValidationException("Attribute `version' not available for root element");
         }
-        int res = Arrays.binarySearch(VERSIONS, restVersion);
-        if (res == -1) {
+        Version stored = new VersionImpl(restVersion);
+        if(!stored.isWithin(MIN, MAX)) {
             throw new VersionValidationException("Version not supported");
         }
     }
 
     public static class VersionValidationException extends Exception {
-
         public VersionValidationException(String message) {
             super(message);
         }
-        
     }
 }