* Java 11+ runtime support

* Twemoji v12.0
kion · Apr 28, 2019 · aebe5a5 · aebe5a5
1 parent 24aeb49
commit aebe5a5
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 51 deletions.
diff --git a/build.xml b/build.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project default="createRunJar" name="Twipstr">
+    <property file="build.properties" />
     <target name="createRunJar">
         <jar destfile="build/twipstr.jar" filesetmanifest="mergewithoutmain">
             <manifest>
@@ -10,6 +11,14 @@
             <zipfileset excludes="META-INF/*.SF" src="lib/twitter4j-core-4.0.5.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="lib/twitter4j-media-support-4.0.5.jar"/>
             <zipfileset excludes="META-INF/*.SF" src="lib/bitlyj-2.0.0.jar"/>
+            <zipfileset src="${javafx.home}/lib/javafx.base.jar"/>
+            <zipfileset src="${javafx.home}/lib/javafx.controls.jar"/>
+            <zipfileset src="${javafx.home}/lib/javafx.fxml.jar"/>
+            <zipfileset src="${javafx.home}/lib/javafx.graphics.jar"/>
+            <zipfileset src="${javafx.home}/lib/javafx.media.jar"/>
+            <zipfileset src="${javafx.home}/lib/javafx.swing.jar"/>
+            <zipfileset src="${javafx.home}/lib/javafx.web.jar"/>
+            <fileset dir="${javafx.home}/lib" includes="*.so"/>
         </jar>
     </target>
 </project>
diff --git a/src/name/kion/twipstr/Constants.java b/src/name/kion/twipstr/Constants.java
@@ -21,7 +21,7 @@
  */
 public interface Constants {
 
-	public static final String APP_INFO_NAME_AND_VERSION = "~ Twipstr 1.4.1 ~";
+	public static final String APP_INFO_NAME_AND_VERSION = "~ Twipstr 1.5.0 ~";
 	public static final String APP_INFO_URL = "https://kion.github.io/Twipstr";
 	public static final String APP_INFO_AUTHOR = "© Kion";
 	public static final String APP_INFO_AUTHOR_URL = "http://kion.name";

diff --git a/src/name/kion/twipstr/res/preview.html b/src/name/kion/twipstr/res/preview.html
@@ -5,6 +5,18 @@
     <meta charset="UTF-8"> 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <style>
+    body {
+      background-color: #e6ecf0;
+    }
+    #status-content {
+      width: 1000px;
+      font-size: 2.4em;
+      margin: 50px auto;
+    }
+    #status-content img.media {
+      width: 1000px;
+      margin-top: 20px;
+    }
     ul.emoji-list * {
       -webkit-user-select: none;
       -moz-user-select: none;
@@ -25,20 +37,8 @@
       margin: 0 .05em 0 .1em;
       vertical-align: -0.1em;
     }
-    #status-content {
-        width: 1000px;
-        font-size: 2.4em;
-        margin: 50px auto;
-    }
-    #status-content img.media {
-        width: 1000px;
-        margin-top: 20px;
-    }
-    body {
-        background-color: #e6ecf0;
-    }
     </style>
-    <script src="http://twemoji.maxcdn.com/twemoji.min.js"></script>
+    <script src="http://twemoji.maxcdn.com/2/twemoji.min.js?12.0.0"></script>
   </head>
   <body>
     <div id="status-content"><!--%STATUS_CONTENT%--></div>