From fccf3212e68e12ee765be41bd5ae0f84867134b5 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sat, 8 Feb 2014 21:22:07 +0100 Subject: [PATCH] gradle: cleanups --- vtm-android/build.gradle | 5 ---- vtm-gdx-desktop/build.gradle | 55 ++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle index 9ba157ee..b24178f3 100644 --- a/vtm-android/build.gradle +++ b/vtm-android/build.gradle @@ -2,11 +2,6 @@ apply plugin: 'android-library' apply plugin: 'android-maven' -repositories { - mavenCentral() - mavenLocal() -} - //http://stackoverflow.com/questions/20674650/how-to-configure-ndk-with-android-gradle-plugin-0-7 task nativeLibsToJar(type: Zip, description: 'create a jar with native libs') { destinationDir file("$buildDir/native-libs") diff --git a/vtm-gdx-desktop/build.gradle b/vtm-gdx-desktop/build.gradle index c5318638..d4a08e83 100644 --- a/vtm-gdx-desktop/build.gradle +++ b/vtm-gdx-desktop/build.gradle @@ -1,34 +1,33 @@ -project(':vtm-gdx-desktop') { - apply plugin: 'java' - apply plugin: 'maven' - apply plugin: 'application' - mainClassName = 'org.oscim.gdx.GdxMapApp' +apply plugin: 'java' +apply plugin: 'maven' +apply plugin: 'application' - task copyAssets(type: Copy) { - from "$rootDir/vtm/assets" - into "assets" - include '**/*' - } +mainClassName = 'org.oscim.gdx.GdxMapApp' - tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyAssets } +task copyAssets(type: Copy) { + from "$rootDir/vtm/assets" + into "assets" + include '**/*' +} - sourceSets { - main.java.srcDirs = ['src'] - main.resources.srcDirs = ['src'] - main.resources.srcDirs = ['assets'] - output.resourcesDir = 'assets' - } +tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyAssets } - run { ignoreExitValue = true } +sourceSets { + main.java.srcDirs = ['src'] + main.resources.srcDirs = ['src'] + main.resources.srcDirs = ['assets'] + output.resourcesDir = 'assets' +} - dependencies { - compile project(':vtm-gdx') - compile files('../vtm-ext-libs/gdx/gdx-backend-lwjgl.jar') - compile files('../vtm-ext-libs/gdx/gdx-backend-lwjgl-natives.jar') - compile files('../vtm-ext-libs/gdx/gdx-natives.jar') - compile files('../vtm-ext-libs/gdx/vtm-jni-natives.jar') - compile 'org.slf4j:slf4j-api:1.7.5' - compile 'org.slf4j:slf4j-simple:1.7.5' - } -} \ No newline at end of file +run { ignoreExitValue = true } + +dependencies { + compile project(':vtm-gdx') + compile files('../vtm-ext-libs/gdx/gdx-backend-lwjgl.jar') + compile files('../vtm-ext-libs/gdx/gdx-backend-lwjgl-natives.jar') + compile files('../vtm-ext-libs/gdx/gdx-natives.jar') + compile files('../vtm-ext-libs/gdx/vtm-jni-natives.jar') + compile 'org.slf4j:slf4j-api:1.7.5' + compile 'org.slf4j:slf4j-simple:1.7.5' +}