Browse Source

Merge pull request #481 from neph1/fix_failed_build

update to 3.6.0-stable and ignore META-INF entry when making project.xml
Rickard Edén 2 years ago
parent
commit
e99e037a69
2 changed files with 3 additions and 3 deletions
  1. 2 2
      build.gradle
  2. 1 1
      gradle.properties

+ 2 - 2
build.gradle

@@ -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('/','.');
@@ -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('/','.');

+ 1 - 1
gradle.properties

@@ -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