Skip to content

Commit e99e037

Browse files
authored
Merge pull request #481 from neph1/fix_failed_build
update to 3.6.0-stable and ignore META-INF entry when making project.xml
2 parents 33d0119 + 6c7474b commit e99e037

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ task createBaseXml(dependsOn: configurations.corelibs) {
179179
jmeJarFiles.each{jarFile ->
180180
ZipFile file = new ZipFile(jarFile)
181181
file.entries().each { entry ->
182-
if(entry.name.endsWith('.class')){
182+
if(!entry.name.startsWith('META-INF') && entry.name.endsWith('.class')){
183183
// TODO: "/" works on windows?
184184
def pathPart = entry.name.substring(0, Math.max(0, entry.name.lastIndexOf('/')))
185185
def classPath = pathPart.replace('/','.');
@@ -195,7 +195,7 @@ task createBaseXml(dependsOn: configurations.corelibs) {
195195
externalJarFiles.each{jarFile ->
196196
ZipFile file = new ZipFile(jarFile)
197197
file.entries().each { entry ->
198-
if(entry.name.endsWith('.class')){
198+
if(!entry.name.startsWith('META-INF') && entry.name.endsWith('.class')){
199199
// TODO: "/" works on windows?
200200
def pathPart = entry.name.substring(0, Math.max(0, entry.name.lastIndexOf('/')))
201201
def classPath = pathPart.replace('/','.');

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jmeVersion = 3.6.0
33
# Version used for application and settings folder, no spaces!
44
jmeMainVersion = 3.6
55
# Version addition pre-alpha-svn, Stable, Beta
6-
jmeVersionTag = beta3
6+
jmeVersionTag = stable
77
# Increment this each time jmeVersionTag changes but jmeVersion stays the same
88
#jmeVersionTagID = 0
99

0 commit comments

Comments
 (0)