build: fix gradle 3.2.1 deprecations

native-compilation-test
Kirill Vainer 8 years ago
parent 36e9a0d1c6
commit 356b3d6726
  1. 5
      build.gradle
  2. 4
      jme3-bullet-native-android/build.gradle
  3. 2
      jme3-bullet-native/build.gradle
  4. 4
      jme3-examples/build.gradle

@ -29,8 +29,8 @@ task run(dependsOn: ':jme3-examples:run') {
defaultTasks 'run' defaultTasks 'run'
task libDist(dependsOn: subprojects.build) << { task libDist(dependsOn: subprojects.build, description: 'Builds and copies the engine binaries, sources and javadoc to build/libDist') {
// description 'Builds and copies the engine binaries, sources and javadoc to build/libDist' doLast {
File libFolder = mkdir("$buildDir/libDist/lib") File libFolder = mkdir("$buildDir/libDist/lib")
File sourceFolder = mkdir("$buildDir/libDist/sources") File sourceFolder = mkdir("$buildDir/libDist/sources")
File javadocFolder = mkdir("$buildDir/libDist/javadoc") File javadocFolder = mkdir("$buildDir/libDist/javadoc")
@ -59,6 +59,7 @@ task libDist(dependsOn: subprojects.build) << {
} }
} }
} }
}
} }
task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"Package the nightly zip distribution"){ task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"Package the nightly zip distribution"){

@ -102,7 +102,8 @@ task copyJmeAndroid(type: Copy, dependsOn:copyJmeCpp) {
into outputDir into outputDir
} }
task generateNativeHeaders(dependsOn: copyJmeAndroid) << { task generateNativeHeaders(dependsOn: copyJmeAndroid) {
doLast {
String destDirPath = jniPath String destDirPath = jniPath
String classes = " \ String classes = " \
com.jme3.bullet.PhysicsSpace, \ com.jme3.bullet.PhysicsSpace, \
@ -153,6 +154,7 @@ task generateNativeHeaders(dependsOn: copyJmeAndroid) << {
args '-classpath', projectClassPath args '-classpath', projectClassPath
args classes.split(",").collect { it.trim() } args classes.split(",").collect { it.trim() }
} }
}
} }
task buildBulletNativeLib(type: Exec, dependsOn: generateNativeHeaders) { task buildBulletNativeLib(type: Exec, dependsOn: generateNativeHeaders) {

@ -215,7 +215,7 @@ unzipBullet.dependsOn {
} }
} }
task unzipBulletIfNeeded << { task unzipBulletIfNeeded {
} }
unzipBulletIfNeeded.dependsOn { unzipBulletIfNeeded.dependsOn {

@ -63,7 +63,8 @@ jar.doFirst{
task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar', ':jme3-android:jar', \ task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar', ':jme3-android:jar', \
':jme3-android-native:jar', ':jme3-bullet-native-android:jar', \ ':jme3-android-native:jar', ':jme3-bullet-native-android:jar', \
':jme3-bullet-native:jar']) << { ':jme3-bullet-native:jar']) {
doLast {
// Copy all dependencies to ../dist/lib, remove versions from jar files // Copy all dependencies to ../dist/lib, remove versions from jar files
configurations.compile.resolvedConfiguration.resolvedArtifacts.each { artifact -> configurations.compile.resolvedConfiguration.resolvedArtifacts.each { artifact ->
copy { copy {
@ -128,4 +129,5 @@ task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar', ':jme3-and
into '../dist/opt/native-bullet' into '../dist/opt/native-bullet'
rename {project(':jme3-bullet-native-android').name+".jar"} rename {project(':jme3-bullet-native-android').name+".jar"}
} }
}
} }

Loading…
Cancel
Save