Merge pull request #2920 from open-osrs/api-version
client: Seperate system and api version
This commit is contained in:
@@ -10,6 +10,7 @@ public class OpenOSRS
|
||||
public static final File OPENOSRS_DIR = new File(System.getProperty("user.home"), ".openosrs");
|
||||
public static final File EXTERNALPLUGIN_DIR = new File(OPENOSRS_DIR, "plugins");
|
||||
public static final String SYSTEM_VERSION;
|
||||
public static final String SYSTEM_API_VERSION;
|
||||
|
||||
public static String uuid = UUID.randomUUID().toString();
|
||||
|
||||
@@ -25,6 +26,7 @@ public class OpenOSRS
|
||||
e.printStackTrace();
|
||||
}
|
||||
SYSTEM_VERSION = properties.getProperty("oprs.version", "0.0.0");
|
||||
SYSTEM_API_VERSION = properties.getProperty("oprs.api.version");
|
||||
}
|
||||
|
||||
public static void preload()
|
||||
|
||||
@@ -34,7 +34,7 @@ import com.google.inject.Injector;
|
||||
import com.google.inject.Key;
|
||||
import com.google.inject.Module;
|
||||
import static com.openosrs.client.OpenOSRS.EXTERNALPLUGIN_DIR;
|
||||
import static com.openosrs.client.OpenOSRS.SYSTEM_VERSION;
|
||||
import static com.openosrs.client.OpenOSRS.SYSTEM_API_VERSION;
|
||||
import com.openosrs.client.config.OpenOSRSConfig;
|
||||
import com.openosrs.client.events.OPRSPluginChanged;
|
||||
import com.openosrs.client.events.OPRSRepositoryChanged;
|
||||
@@ -143,7 +143,7 @@ public class OPRSExternalPluginManager
|
||||
private void initPluginManager()
|
||||
{
|
||||
externalPluginManager = new OPRSExternalPf4jPluginManager(this);
|
||||
externalPluginManager.setSystemVersion(SYSTEM_VERSION);
|
||||
externalPluginManager.setSystemVersion(SYSTEM_API_VERSION);
|
||||
}
|
||||
|
||||
public boolean doesGhRepoExist(String owner, String name)
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
oprs.api.version=1.0.0
|
||||
oprs.version=@open.osrs.version@
|
||||
Reference in New Issue
Block a user