Browse Source

Merge remote-tracking branch 'origin/release/9.0' into release/9.0

master
ju 7 years ago
parent
commit
60bd13b1e6
  1. 2
      build.9.0.gradle
  2. 2
      designer_base/src/com/fr/design/extra/PluginUtils.java

2
build.9.0.gradle

@ -15,7 +15,7 @@ task appletJar<<{
fileset(dir:"${basicDir}/report/build/classes/main")
fileset(dir:"${basicDir}/platform/build/classes/main")
}
unjar(src:"${libDir}/3rd.jar",dest:"./tmp")
unjar(src:"${libDir}/fr-third-9.0.jar",dest:"./tmp")
unjar(src:"${libDir}/servlet-api.jar",dest:"./tmp")
jar(jarfile:"build/libs/fr-applet-9.0.jar"){
fileset(dir:"build/classes"){

2
designer_base/src/com/fr/design/extra/PluginUtils.java

@ -195,7 +195,7 @@ public class PluginUtils {
JSONArray resultJSONArray = JSONArray.create();
for(int i = 0; i < oriJSONArray.length(); i++){
JSONObject jo = oriJSONArray.getJSONObject(i);
String envVersion = jo.optString("env-version");
String envVersion = jo.optString("envversion");
if(isCompatibleCurrentEnv(envVersion)){
resultJSONArray.put(jo);
}

Loading…
Cancel
Save