Skip to content

update to 3.6.0-stable and ignore META-INF entry when making project.xml #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2023
Merged

update to 3.6.0-stable and ignore META-INF entry when making project.xml #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ task createBaseXml(dependsOn: configurations.corelibs) {
jmeJarFiles.each{jarFile ->
ZipFile file = new ZipFile(jarFile)
file.entries().each { entry ->
if(entry.name.endsWith('.class')){
if(!entry.name.startsWith('META-INF') && entry.name.endsWith('.class')){
// TODO: "/" works on windows?
def pathPart = entry.name.substring(0, Math.max(0, entry.name.lastIndexOf('/')))
def classPath = pathPart.replace('/','.');
Expand All @@ -195,7 +195,7 @@ task createBaseXml(dependsOn: configurations.corelibs) {
externalJarFiles.each{jarFile ->
ZipFile file = new ZipFile(jarFile)
file.entries().each { entry ->
if(entry.name.endsWith('.class')){
if(!entry.name.startsWith('META-INF') && entry.name.endsWith('.class')){
// TODO: "/" works on windows?
def pathPart = entry.name.substring(0, Math.max(0, entry.name.lastIndexOf('/')))
def classPath = pathPart.replace('/','.');
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jmeVersion = 3.6.0
# Version used for application and settings folder, no spaces!
jmeMainVersion = 3.6
# Version addition pre-alpha-svn, Stable, Beta
jmeVersionTag = beta3
jmeVersionTag = stable
# Increment this each time jmeVersionTag changes but jmeVersion stays the same
#jmeVersionTagID = 0

Expand Down