Skip to content

Commit 528db17

Browse files
committed
Slf4j
1 parent d4cba66 commit 528db17

File tree

1,232 files changed

+17148
-20356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,232 files changed

+17148
-20356
lines changed

.classpath

-53
This file was deleted.

.gitattributes

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#
2+
# https://help.github.com/articles/dealing-with-line-endings/
3+
#
4+
# These are explicitly windows files and should use crlf
5+
*.bat text eol=crlf
6+

.gitignore

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
/setup.exe
2-
/update.exe
3-
/drivers.exe
4-
/config.properties
5-
/bin
6-
/setup_new.nsi
7-
/.metadata
1+
# Ignore Gradle project-specific cache directory
2+
.gradle
3+
4+
# Ignore Gradle build output directory
5+
build

.gitmodules

-3
This file was deleted.

.project

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>Flashtool</name>
4-
<comment></comment>
3+
<name>Flashtool Project</name>
4+
<comment>Project Flashtool.gradle created by Buildship.</comment>
55
<projects>
66
</projects>
77
<buildSpec>
88
<buildCommand>
9-
<name>org.eclipse.jdt.core.javabuilder</name>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
1313
</buildSpec>
1414
<natures>
15-
<nature>org.eclipse.jdt.core.javanature</nature>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
1616
</natures>
1717
</projectDescription>
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
arguments=
2+
auto.sync=false
3+
build.scans.enabled=false
4+
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
5+
connection.project.dir=
6+
eclipse.preferences.version=1
7+
gradle.user.home=
8+
java.home=
9+
jvm.arguments=
10+
offline.mode=false
11+
override.workspace.settings=false
12+
show.console.view=false
13+
show.executions.view=false

.settings/org.eclipse.core.resources.prefs

-8
This file was deleted.

BUILD.md

-43
This file was deleted.

Flashtool/.classpath

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="bin/main" path="src/main/java">
4+
<attributes>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="bin/main" path="src/main/resources">
10+
<attributes>
11+
<attribute name="gradle_scope" value="main"/>
12+
<attribute name="gradle_used_by_scope" value="main,test"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="src" output="bin/test" path="src/test/java">
16+
<attributes>
17+
<attribute name="gradle_scope" value="test"/>
18+
<attribute name="gradle_used_by_scope" value="test"/>
19+
<attribute name="test" value="true"/>
20+
</attributes>
21+
</classpathentry>
22+
<classpathentry kind="src" output="bin/test" path="src/test/resources">
23+
<attributes>
24+
<attribute name="gradle_scope" value="test"/>
25+
<attribute name="gradle_used_by_scope" value="test"/>
26+
<attribute name="test" value="true"/>
27+
</attributes>
28+
</classpathentry>
29+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
30+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
31+
<classpathentry kind="output" path="bin/default"/>
32+
</classpath>

Flashtool/.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Flashtool</name>
4+
<comment>Project Flashtool created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
</projectDescription>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=..
2+
eclipse.preferences.version=1

Flashtool/bin/main/.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/custom/
2+
/gui/
3+
/launch4j/
4+
/native/
5+
/org/

Flashtool/bin/test/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/org/

Flashtool/build.gradle

+161
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
/*
2+
* This file was generated by the Gradle 'init' task.
3+
*
4+
* This generated file contains a sample Java application project to get you started.
5+
* For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
6+
* User Manual available at https://docs.gradle.org/7.4.2/userguide/building_java_projects.html
7+
*/
8+
plugins {
9+
id 'application'
10+
id 'eclipse'
11+
id 'java'
12+
//id("com.github.johnrengelman.shadow") version "7.1.2"
13+
id 'org.beryx.runtime' version '1.12.7'
14+
id 'edu.sc.seis.launch4j' version '2.5.3'
15+
id "com.github.langmo.gradlensis" version "0.1.0"
16+
}
17+
18+
repositories {
19+
// Use Maven Central for resolving dependencies.
20+
mavenCentral()
21+
}
22+
23+
java {
24+
sourceCompatibility = JavaVersion.toVersion("17")
25+
targetCompatibility = JavaVersion.toVersion("17")
26+
}
27+
28+
dependencies {
29+
// Use TestNG framework, also requires calling test.useTestNG() below
30+
testImplementation 'org.testng:testng:7.4.0'
31+
32+
implementation 'com.google.guava:guava:31.1-jre'
33+
implementation 'info.picocli:picocli:4.6.3'
34+
implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
35+
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.12.1'
36+
implementation group: 'com.igormaznitsa', name: 'jbbp', version: '2.0.4'
37+
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.0-beta0'
38+
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.3.0-beta0'
39+
40+
implementation('org.slf4j:slf4j-api:2.0.0')
41+
implementation group: 'org.slf4j', name: 'slf4j-ext', version: '2.0.0'
42+
implementation group: 'org.eclipse.platform', name: 'org.eclipse.swt', version: '3.119.0'
43+
implementation group: 'org.eclipse.platform', name: 'org.eclipse.core.runtime', version: '3.24.100'
44+
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.21'
45+
implementation group: 'org.rauschig', name: 'jarchivelib', version: '1.2.0'
46+
implementation group: 'org.eclipse.platform', name: 'org.eclipse.core.commands', version: '3.10.100'
47+
implementation group: 'org.eclipse.platform', name: 'org.eclipse.jface', version: '3.25.0'
48+
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.1.0.202203080745-r'
49+
implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit.archive', version: '6.1.0.202203080745-r'
50+
51+
implementation group: 'net.dongliu', name: 'apk-parser', version: '2.6.10'
52+
implementation group: 'org.riversun', name: 'bigdoc', version: '0.3.0'
53+
implementation group: 'org.lz4', name: 'lz4-java', version: '1.8.0'
54+
implementation group: 'org.bidib.com.github.markusbernhardt', name: 'proxy-vole', version: '1.0.16'
55+
56+
implementation group: 'org.bouncycastle', name: 'bcutil-jdk18on', version: '1.71'
57+
implementation group: 'org.jdom', name: 'jdom2', version: '2.0.6.1'
58+
implementation 'net.fornwall:jelf:0.7.0'
59+
implementation group: 'com.turn', name: 'ttorrent-core', version: '1.5'
60+
implementation group: 'org.apache-extras.beanshell', name: 'bsh', version: '2.0b6'
61+
62+
compileOnly group: 'org.projectlombok' ,name: 'lombok' ,version: '1.18.24'
63+
64+
}
65+
66+
configurations.all {
67+
resolutionStrategy {
68+
dependencySubstitution {
69+
def os = System.getProperty("os.name").toLowerCase()
70+
if (os.contains("windows")) {
71+
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")
72+
}
73+
else if (os.contains("linux")) {
74+
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")
75+
}
76+
else if (os.contains("mac")) {
77+
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")
78+
}
79+
}
80+
}
81+
}
82+
83+
nsis {
84+
// Enter here the configuration settings of the gradle-nsis plugin.
85+
// Note: a task "createInstaller" is automatically generated.
86+
87+
// path to the NSIS configuration file
88+
configuration = file("${projectDir}/nsis/setup.nsi")
89+
90+
// folder where the NSIS installer generator is run. All paths
91+
// in the NSIS configuration file are relative to this folder.
92+
runIn = file("${projectDir}/build/install/Flashtool")
93+
}
94+
95+
distributions {
96+
main {
97+
def os = System.getProperty("os.name").toLowerCase()
98+
contents {
99+
from ('src/main/resources/custom') { into 'custom' }
100+
from {
101+
if (os.contains("windows")) {
102+
'src/main/resources/native/windows'
103+
}
104+
else if (os.contains("linux")) {
105+
'src/main/resources/native/linux' }
106+
else if (os.contains("mac")) {
107+
'src/main/resources/native/mac'
108+
}
109+
}
110+
from(jre) {
111+
into 'jre'
112+
}
113+
if (os.contains("windows")) {
114+
from (project(':FlashtoolDrivers').buildDir.toString()+'/distributions') {
115+
into 'drivers'
116+
}
117+
}
118+
}
119+
}
120+
}
121+
122+
[distZip, distTar, installDist]*.dependsOn(':FlashtoolDrivers:createInstaller')
123+
124+
jar {
125+
processResources {
126+
exclude("native/**")
127+
exclude("custom/**")
128+
exclude("launch4j/**")
129+
}
130+
}
131+
132+
application {
133+
// Define the main class for the application.
134+
mainClass = 'org.flashtool.gui.Main'
135+
applicationDefaultJvmArgs = ['-Dlog4j2.Script.enableLanguages=bsh','-Xms256m','-Xmx1024m','-Duser.country=US','-Duser.language=en','-Djsse.enableSNIExtension=false']
136+
startScripts.enabled = false
137+
}
138+
139+
140+
runtime {
141+
options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
142+
modules = ['java.base','java.compiler','java.datatransfer','java.desktop','java.instrument','java.logging','java.management','java.naming','java.prefs','java.rmi','java.scripting','java.security.jgss','java.security.sasl','java.sql','java.transaction.xa','java.xml','jdk.attach','jdk.jdi','jdk.unsupported','jdk.xml.dom','jdk.security.auth','jdk.security.jgss','jdk.crypto.cryptoki','jdk.crypto.ec','jdk.management']
143+
imageDir = file("$buildDir/image/jre")
144+
}
145+
146+
launch4j {
147+
mainClassName = 'org.flashtool.gui.Main'
148+
icon = "${projectDir}/src/main/resources/launch4j/Flashtool.ico"
149+
jreRuntimeBits = "64"
150+
jvmOptions = ['-Dlog4j2.Script.enableLanguages=bsh','-Dlog4j2.Script.enableLanguages=bsh','-Xms256m','-Xmx1024m','-Duser.country=US','-Duser.language=en','-Djsse.enableSNIExtension=false']
151+
}
152+
153+
testing {
154+
suites {
155+
// Configure the built-in test suite
156+
test {
157+
// Use TestNG test framework
158+
useTestNG('7.4.0')
159+
}
160+
}
161+
}

0 commit comments

Comments
 (0)