diff --git a/build.gradle b/build.gradle index bb86d0101ae..ed969749bce 100644 --- a/build.gradle +++ b/build.gradle @@ -74,23 +74,23 @@ task libDist(dependsOn: subprojects.build, description: 'Builds and copies the e subprojects.each {project -> if(!project.hasProperty('mainClassName')){ project.tasks.withType(Jar).each {archiveTask -> - if(archiveTask.classifier == "sources"){ + if(archiveTask.archiveClassifier == "sources"){ copy { from archiveTask.archivePath into sourceFolder - rename {project.name + '-' + archiveTask.classifier +'.'+ archiveTask.extension} + rename {project.name + '-' + archiveTask.archiveClassifier +'.'+ archiveTask.archiveExtension} } - } else if(archiveTask.classifier == "javadoc"){ + } else if(archiveTask.archiveClassifier == "javadoc"){ copy { from archiveTask.archivePath into javadocFolder - rename {project.name + '-' + archiveTask.classifier +'.'+ archiveTask.extension} + rename {project.name + '-' + archiveTask.archiveClassifier +'.'+ archiveTask.archiveExtension} } } else{ copy { from archiveTask.archivePath into libFolder - rename {project.name + '.' + archiveTask.extension} + rename {project.name + '.' + archiveTask.archiveExtension} } } } diff --git a/common.gradle b/common.gradle index a8aaa692304..90beb8427b5 100644 --- a/common.gradle +++ b/common.gradle @@ -85,12 +85,12 @@ test { } task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates a jar from the source files.') { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets*.allSource } task javadocJar(type: Jar, dependsOn: javadoc, description: 'Creates a jar from the javadoc files.') { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } @@ -218,8 +218,8 @@ checkstyleTest { tasks.withType(Checkstyle) { reports { - xml.enabled false - html.enabled true + xml.required.set(false) + html.required.set(true) } include("**/com/jme3/renderer/**/*.java") } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c7d437bbb47..2617362fd0b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jme3-android-native/bufferallocator.gradle b/jme3-android-native/bufferallocator.gradle index f03027e2753..d10335a7f2e 100644 --- a/jme3-android-native/bufferallocator.gradle +++ b/jme3-android-native/bufferallocator.gradle @@ -44,6 +44,9 @@ task copyPreCompiledLibsBufferAllocator(type: Copy) { from file(bufferAllocatorPreCompiledLibsDir) into file(bufferAllocatorBuildLibsDir) } +if (skipPrebuildLibraries != "true" && buildNativeProjects != "true") { + copyPreCompiledLibsBufferAllocator.dependsOn(rootProject.extractPrebuiltNatives) +} // ndkExists is a boolean from the build.gradle in the root project // buildNativeProjects is a string set to "true" diff --git a/jme3-android-native/decode.gradle b/jme3-android-native/decode.gradle index 27dc02dd5b8..d6a3842f028 100644 --- a/jme3-android-native/decode.gradle +++ b/jme3-android-native/decode.gradle @@ -83,6 +83,9 @@ task copyPreCompiledLibs(type: Copy) { from sourceDir into outputDir } +if (skipPrebuildLibraries != "true" && buildNativeProjects != "true") { + copyPreCompiledLibs.dependsOn(rootProject.extractPrebuiltNatives) +} // ndkExists is a boolean from the build.gradle in the root project // buildNativeProjects is a string set to "true" diff --git a/jme3-android-native/openalsoft.gradle b/jme3-android-native/openalsoft.gradle index 8c224ec4575..3cff49b0737 100644 --- a/jme3-android-native/openalsoft.gradle +++ b/jme3-android-native/openalsoft.gradle @@ -111,6 +111,9 @@ task copyPreCompiledOpenAlSoftLibs(type: Copy) { from sourceDir into outputDir } +if (skipPrebuildLibraries != "true" && buildNativeProjects != "true") { + copyPreCompiledOpenAlSoftLibs.dependsOn(rootProject.extractPrebuiltNatives) +} // ndkExists is a boolean from the build.gradle in the root project // buildNativeProjects is a string set to "true"