Merge branch 'dev'

CHANGES.md

@@ -1,3 +1,7 @@
+### Skin Composer Version 25 ###
+* Fixed exception when opening an old project.
+* Improved error message when trying to add a font that is too large for the texture settings.
+
 ### Skin Composer Version 24 ###
 * Updated to LibGDX 1.9.9.
 * Added setting for export with simple names per 1.9.9. See Project > Settings.

README.md

@@ -5,7 +5,7 @@ This project is programmed in Java and depends on LibGDX and the LWJGL3 backend.
 ### Skin Composer ###
 
 * Use Skin Composer to create skins for scene2d.ui
-* Version 24
+* Version 25
 
 ### Contact ###
 

build.gradle

@@ -12,7 +12,7 @@ allprojects {
     apply plugin: "eclipse"
     apply plugin: "idea"
 
-    version = '24'
+    version = '25'
     ext {
         appName = "SkinComposer"
         gdxVersion = '1.9.9-SNAPSHOT'

core/src/com/ray3k/skincomposer/Main.java

@@ -81,7 +81,7 @@
 import com.ray3k.skincomposer.utils.Utils;
 
 public class Main extends ApplicationAdapter {
-    public final static String VERSION = "24";
+    public final static String VERSION = "25";
     public static String newVersion;
     public static final Class[] BASIC_CLASSES = {Button.class, CheckBox.class,
         ImageButton.class, ImageTextButton.class, Label.class, List.class,

core/src/com/ray3k/skincomposer/data/StyleData.java

@@ -306,7 +306,7 @@ public void read(Json json, JsonValue jsonData) {
             Gdx.app.error(getClass().toString(), "Error reading from serialized object" , ex);
             main.getDialogFactory().showDialogError("Read Error...","Error reading from serialized object.\n\nOpen log?");
         }
-        parent = jsonData.getString("parent");
+        parent = jsonData.getString("parent", null);
     }
 
     public void resetProperties() {

core/src/com/ray3k/skincomposer/dialog/DialogFonts.java

@@ -1073,7 +1073,7 @@ private void showAddFontSizeError(String name) {
         dialog.text("Unable to add font \"" + name +
                 "\". Ensure image dimensions\nare less than max texture dimensions (" +
                 maxTextureWidth + "x" + 
-                maxTextureHeight + ").\nSee project settings.");
+                maxTextureHeight + ").\nSee Project > Settings > Texture Packer Settings.");
 
         dialog.getButtonTable().defaults().padBottom(10.0f).minWidth(50.0f);
         dialog.button("Ok");

desktop/build.gradle

@@ -24,6 +24,7 @@ task debug(dependsOn: classes, type: JavaExec) {
 }
 
 task dist(type: Jar) {
+    archiveName = "skin_composer.jar";
     from files(sourceSets.main.output.classesDir)
     from files(sourceSets.main.output.resourcesDir)
     from {configurations.compile.collect {zipTree(it)}}
@@ -65,7 +66,10 @@ task javaPackager(type: Exec, dependsOn: dist) {
     commandLine = commands
 
     doLast() {
-        copySplashImage.execute();
+        copy {
+            from file("${project.projectDir}/splash.png");
+            into file("${buildDir}/distribution/${project.appName}/app");
+        }
     }
 }
 
@@ -74,15 +78,15 @@ task cleanPackagerRuntime(dependsOn: javaPackager) {
     doLast() {
         File runtimeFile = new File("${buildDir}/distribution/${project.appName}/runtime")
         runtimeFile.deleteDir()
+        delete {
+            delete fileTree("${buildDir}/distribution/${project.appName}").matching {
+                include "api*.dll"
+            }
+        }
         System.out.println("deleting bloated runtime in " + runtimeFile)
     }
 }
 
-task copySplashImage(type: Copy) {
-    from file("${project.projectDir}/splash.png");
-    into file("${buildDir}/distribution/${project.appName}/app");
-}
-
 // creates a replacement runtime via jlink command (much smaller than jpackager)
 task createFinalAppBundle(type: Exec, dependsOn: [cleanPackagerRuntime]) {
     def jdk = System.getProperty("java.home")
@@ -107,9 +111,22 @@ task createFinalAppBundle(type: Exec, dependsOn: [cleanPackagerRuntime]) {
     }
 }
 
-task updateDistribution(type: Copy, dependsOn: [dist]) {
-    from "${buildDir}/libs"
-    into "${buildDir}/distribution/${project.appName}/app"
+task updateAndCreateZip(type: Zip, dependsOn: [dist]) {
+    doFirst {
+        copy {
+            from "${buildDir}/libs"
+            into "${buildDir}/distribution/${project.appName}/app"
+        }
+
+        copy {
+            from '../README.md'
+            into "${buildDir}/distribution/${project.appName}"
+        }
+    }
+
+    archiveName "skin-composer-${org.gradle.internal.os.OperatingSystem.current().getFamilyName()}.zip"
+    from "${buildDir}/distribution/${project.appName}"
+    destinationDir = file("${buildDir}/distribution/")
 }
 
 eclipse {

version

@@ -1 +1 @@
-24
+25