Prepare for release 0.9.35.0

Androxyde · Sep 11, 2022 · 297d7a5 · 297d7a5
1 parent 5c79217
commit 297d7a5
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 443 deletions.
diff --git a/Flashtool/bin/main/.gitignore b/Flashtool/bin/main/.gitignore
@@ -1,2 +1 @@
 /org/
-/ch/
diff --git a/Flashtool/bin/main/ch/qos/logback/core/FlashtoolAppender$1.class b/Flashtool/bin/main/ch/qos/logback/core/FlashtoolAppender$1.class
diff --git a/Flashtool/bin/main/ch/qos/logback/core/FlashtoolAppender$2.class b/Flashtool/bin/main/ch/qos/logback/core/FlashtoolAppender$2.class
diff --git a/Flashtool/bin/main/ch/qos/logback/core/FlashtoolAppender.class b/Flashtool/bin/main/ch/qos/logback/core/FlashtoolAppender.class
diff --git a/Flashtool/build.gradle b/Flashtool/build.gradle
@@ -36,25 +36,25 @@ dependencies {
 	implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
 	implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.12.1'
 	implementation group: 'com.igormaznitsa', name: 'jbbp', version: '2.0.4'
-	implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.3.0-beta0'
-	implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.0-beta0'
+	implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.4.0'
+	implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.0'
 
 	implementation('org.slf4j:slf4j-api:2.0.0')
 	implementation group: 'org.slf4j', name: 'slf4j-ext', version: '2.0.0'
 
-	implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt', version: '3.119.0'
-	implementation group: 'org.eclipse.platform', name: 'org.eclipse.core.runtime', version: '3.24.100'
+	implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt', version: '3.120.0'
+	implementation group: 'org.eclipse.platform', name: 'org.eclipse.core.runtime', version: '3.25.0'
 	implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.21'
 	implementation group: 'org.rauschig', name: 'jarchivelib', version: '1.2.0'
-	implementation group: 'org.eclipse.platform', name: 'org.eclipse.core.commands', version: '3.10.100'
-	implementation group: 'org.eclipse.platform', name: 'org.eclipse.jface', version: '3.25.0'
-	implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.1.0.202203080745-r'
-	implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit.archive', version: '6.1.0.202203080745-r'
+	implementation group: 'org.eclipse.platform', name: 'org.eclipse.core.commands', version: '3.10.200'
+	implementation group: 'org.eclipse.platform', name: 'org.eclipse.jface', version: '3.26.0'
+	implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.3.0.202209071007-r'
+	implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit.archive', version: '6.3.0.202209071007-r'
 
 	implementation group: 'net.dongliu', name: 'apk-parser', version: '2.6.10'
 	implementation group: 'org.riversun', name: 'bigdoc', version: '0.3.0'
 	implementation group: 'org.lz4', name: 'lz4-java', version: '1.8.0'
-	implementation group: 'org.bidib.com.github.markusbernhardt', name: 'proxy-vole', version: '1.0.16'
+	implementation group: 'org.bidib.com.github.markusbernhardt', name: 'proxy-vole', version: '1.0.17'
 
 	implementation group: 'org.bouncycastle', name: 'bcutil-jdk18on', version: '1.71'
 	implementation group: 'org.jdom', name: 'jdom2', version: '2.0.6.1'
@@ -71,13 +71,13 @@ configurations.all {
 		dependencySubstitution {
 			def os = System.getProperty("os.name").toLowerCase()
 			if (os.contains("windows")) {
-				substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64:3.114.0")
+				substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64:3.120.0")
 			}
 			else if (os.contains("linux")) {
-				substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64:3.114.0")
+				substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64:3.120.0")
 			}
 			else if (os.contains("mac")) {
-				substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64:3.114.0")
+				substitute module('org.eclipse.platform:org.eclipse.swt.${osgi.platform}') with module("org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64:3.120.0")
 			}
 		}
 	}
@@ -89,7 +89,8 @@ nsis {
 
 	// path to the NSIS configuration file
 	configuration = file("${projectDir}/nsis/setup.nsi")
-
+
+	variables = ['VERSION':"${flashtoolVersion}"]
 	// folder where the NSIS installer generator is run. All paths
 	// in the NSIS configuration file are relative to this folder.
 	runIn =  file("${projectDir}/build/install/Flashtool")
@@ -122,7 +123,7 @@ distributions {
     }
 }
 
-[distZip, distTar, installDist]*.dependsOn(':FlashtoolDrivers:createInstaller')
+[distZip, distTar, installDist, createInstaller]*.dependsOn(':FlashtoolDrivers:createInstaller')
 
 jar {
 	processResources {

diff --git a/Flashtool/nsis/setup.nsi b/Flashtool/nsis/setup.nsi
@@ -9,7 +9,6 @@ RequestExecutionLevel highest
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.9.31.0
 !define COMPANY Androxyde
 !define URL http://androxyde.github.com/Flashtool/