Prepares 1.2.0

oeohomos · Jun 20, 2015 · 112e175 · 112e175
1 parent ca4da6b
commit 112e175
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/app/src/main/groovy/jd/gui/view/MainDescription.groovy b/app/src/main/groovy/jd/gui/view/MainDescription.groovy
@@ -19,6 +19,8 @@ import javax.swing.WindowConstants
 import jd.gui.Constants
 import jd.gui.service.platform.PlatformService
 
+import java.util.jar.Manifest
+
 actions {
 	action(
 		id:'openAction',
@@ -262,10 +264,21 @@ dialog(
                     }
                     hbox {
                         panel(layout:new GridLayout(2,2), opaque:false, border:emptyBorder([5,10,5,50])) {
+                            def jdGuiVersion = 'SNAPSHOT'
+                            def jdCoreVersion = 'SNAPSHOT'
+
+                            getClass().classLoader.getResources('META-INF/MANIFEST.MF').each { uri ->
+                                uri.openStream().withStream { is ->
+                                    def attributes = new Manifest(is).mainAttributes
+                                    jdGuiVersion = attributes.getValue('JD-GUI-Version') ?: jdGuiVersion
+                                    jdCoreVersion = attributes.getValue('JD-Core-Version') ?: jdCoreVersion
+                                }
+                            }
+
                             label(text: 'JD-GUI')
-                            label(text: 'version 1.1.0')
+                            label(text: 'version ' + jdGuiVersion)
                             label(text: 'JD-Core')
-                            label(text: 'version 0.7.1')
+                            label(text: 'version ' + jdCoreVersion)
                         }
                         hglue()
                     }

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'distribution'
 
 // Common configuration //
 allprojects {
-	version='1.1.0'
+	version='1.2.0'
 
 	apply plugin: 'eclipse'
 	apply plugin: 'idea'
@@ -56,7 +56,10 @@ jar {
 	deps = deps.unique().collect { it.isDirectory() ? it : zipTree(it) }
 
 	manifest {
-		attributes 'Main-Class': 'jd.gui.App', 'SplashScreen-Image': 'images/jd_icon_128.png'
+		attributes 'Main-Class': 'jd.gui.App',
+                   'SplashScreen-Image': 'images/jd_icon_128.png',
+                   'JD-GUI-Version': project.version,
+                   'JD-Core-Version': '0.7.1'
 	}
 	from deps
 	exclude 'META-INF/services/jd.gui.spi.*'