xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Gradle build refactoring, closes #46

Browse Source
This commit is contained in:
Emux 2016-07-03 19:09:56 +03:00
parent 11d7002841
commit eca77a0afc
18 changed files with 377 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
build.gradle
View File

@ -1,70 +1,39 @@
buildscript {
repositories {
mavenCentral()
mavenLocal()
}
dependencies {
classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.3'
classpath 'com.android.tools.build:gradle:2.1.2'
// for aar/maven stuff
// https://github.com/dcendents/android-maven-gradle-plugin
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
}
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
}
}
def filterProjects(filter) {
return subprojects.findAll { project -> filter.contains(project.name) }
}
//apply from:'jdee.gradle'
allprojects {
group = 'org.oscim'
version = '0.6.0-SNAPSHOT'
group = 'org.oscim'
version = '0.6.0-SNAPSHOT'
ext.gdxVersion = "1.9.3"
ext.androidBuildVersionTools = "23.0.3"
repositories {
maven { url 'https://github.com/hjanetzek/maven-repo/raw/master/' }
mavenCentral()
// Jeo
// maven { url 'http://repo.boundlessgeo.com/main' }
mavenLocal()
// Local andoird repo
maven { url "${System.env.ANDROID_HOME}/extras/android/m2repository" }
}
// create IntelliJ project settings - untested
apply plugin: 'idea'
ext.androidBuildVersionTools = "23.0.3"
ext.gdxVersion = "1.9.3"
}
def androidCompileSdk() { return 23 }
def androidMinSdk() { return 10 }
def androidTargetSdk() { return 23 }
def androidTargetSdk() { return 22 }
def versionCode() { return 50 }
def versionName() { return version }
subprojects {
// create eclipse project settings
apply plugin: 'eclipse'
repositories {
maven { url 'https://github.com/opensciencemap/maven-repo/raw/master/' }
jcenter()
}
task copySettings(type: Copy) {
from "$rootDir/eclipse"
into ".settings"
include '**/*'
}
tasks.withType(JavaCompile) {
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
}
eclipseProject.dependsOn copySettings
// create emacs JDEE project settings
// http://ignatyev-dev.blogspot.de/2013/07/gradle-projects-in-jdee.html
//apply from:'../jdee.gradle'
tasks.withType(JavaCompile) {
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
}
}

16
jni/build.gradle
View File

@ -1,16 +1,10 @@
repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
apply plugin: 'java'
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
}
dependencies {
compile "com.badlogicgames.gdx:gdx-jnigen:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-jnigen:$gdxVersion"
}
eclipse.project.name = 'vtm-jni'
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
}

143
vtm-android-example/build.gradle
View File

@ -1,112 +1,59 @@
apply plugin: 'com.android.application'
configurations {
providedCompile
eclipseCompile
}
dependencies {
compile project(':vtm-android')
compile project(':vtm-jeo')
compile project(':vtm-extras')
compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile 'com.android.support:support-v4:22.+'
compile 'com.android.support:appcompat-v7:22.+'
//eclipseCompile project(':appcompat')
compile 'com.noveogroup.android:android-logger:1.3.4'
compile project(':vtm-android')
compile project(':vtm-extras')
compile project(':vtm-jeo')
compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile 'com.android.support:support-v4:24.0.0'
compile 'com.android.support:appcompat-v7:24.0.0'
}
android {
compileSdkVersion androidTargetSdk()
buildToolsVersion "$androidBuildVersionTools"
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src', 'assets']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
// remove duplicates
packagingOptions {
exclude 'META-INF/services/org.jeo.data.Driver'
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
}
// ignore deprecated
lintOptions.abortOnError false
}
eclipse {
classpath {
plusConfigurations += [ configurations.compile, configurations.eclipseCompile ]
defaultOutputDir = file('bin/classes')
containers = ['com.android.ide.eclipse.adt.ANDROID_FRAMEWORK',
'com.android.ide.eclipse.adt.LIBRARIES',
'com.android.ide.eclipse.adt.DEPENDENCIES']
file {
// Manipulation of the classpath XML before merging local
// and generated copies
beforeMerged { classpath ->
// Remove all source entries to avoid overlap
classpath.entries.removeAll() { e ->
e.kind == 'src'
}
}
// only used to explode jni .so into aar
whenMerged {
classpath ->
classpath.entries.findAll { e ->
e.path.contains('ANDROID_FRAMEWORK')
}*.exported = false
classpath.entries.removeAll() { e ->
e.path.contains('support')
}
}
// Direct manipulation of the generated classpath XML
withXml {
def node = it.asNode()
node.appendNode('classpathentry kind="src" path="src"')
node.appendNode('classpathentry kind="src" path="gen"')
}
defaultConfig {
versionCode versionCode()
versionName versionName()
minSdkVersion androidMinSdk()
}
}
project {
natures = ['com.android.ide.eclipse.adt.AndroidNature',
'org.eclipse.jdt.core.javanature']
buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder'
buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder'
buildCommand 'com.android.ide.eclipse.adt.ApkBuilder'
}
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src', 'assets']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
lintOptions { abortOnError false }
packagingOptions {
exclude 'META-INF/services/org.jeo.data.Driver'
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
}
}
task run (dependsOn: 'installDebug'){
doFirst {
println(">> adb run...")
String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb'
String cmd = "${adb} shell am start -n org.oscim.android.test/.Samples"
def proc = cmd.execute()
proc.in.eachLine {line -> println line}
proc.err.eachLine {line -> System.err.println( 'ERROR: ' + line)}
proc.waitFor()
}
task run(dependsOn: 'installDebug') {
doFirst {
println(">> adb run...")
String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb'
String cmd = "${adb} shell am start -n org.oscim.android.test/.Samples"
def proc = cmd.execute()
proc.in.eachLine { line -> println line }
proc.err.eachLine { line -> System.err.println('ERROR: ' + line) }
proc.waitFor()
}
}

139
vtm-android-gdx/build.gradle
View File

@ -1,118 +1,53 @@
apply plugin: 'com.android.application'
configurations { providedCompile }
dependencies {
compile project(':vtm-gdx')
compile project(':vtm-themes')
compile 'com.noveogroup.android:android-logger:1.3.4'
compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
//compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
compile files('gdx-natives-android.jar')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile project(':vtm-gdx')
compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
compile files('gdx-natives-android.jar')
}
//task copyLibs(type: Copy) {
// from "$rootDir/vtm-ext-libs/vtm-gdx-android"
// into "libs"
// include '**/*'
//}
//tasks.withType(JavaCompile) { compileTask ->
// compileTask.dependsOn copyLibs }
android {
compileSdkVersion androidTargetSdk()
buildToolsVersion "$androidBuildVersionTools"
lintOptions { abortOnError false }
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src', 'assets']
resources.srcDirs = ['src', 'assets']
aidl.srcDirs = ['src', 'assets']
renderscript.srcDirs = ['src', 'assets']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
}
// Including configurations into Eclipse
eclipse {
// Configuring Eclipse classpath
classpath {
plusConfigurations += [ configurations.compile ]
defaultOutputDir = file('bin/classes')
containers = ['com.android.ide.eclipse.adt.ANDROID_FRAMEWORK',
'com.android.ide.eclipse.adt.LIBRARIES',
'com.android.ide.eclipse.adt.DEPENDENCIES']
file {
beforeMerged { classpath ->
// Remove all source entries to avoid overlap
classpath.entries.removeAll() { c ->
c.kind == 'src'
}
}
// only used to explode jni .so into aar
whenMerged { classpath ->
classpath.entries.findAll { entry ->
entry.path.contains('ANDROID_FRAMEWORK') ||
entry.path.contains('support') ||
entry.path.contains('native-libs')
}*.exported = false
classpath.entries.removeAll { entry ->
entry.path.contains('gdx-2') }
}
// Direct manipulation of the generated classpath XML
withXml {
def node = it.asNode()
node.appendNode('classpathentry kind="src" path="src"')
node.appendNode('classpathentry kind="src" path="gen"')
}
defaultConfig {
versionCode versionCode()
versionName versionName()
minSdkVersion androidMinSdk()
}
}
project {
natures = ['com.android.ide.eclipse.adt.AndroidNature',
'org.eclipse.jdt.core.javanature']
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src', 'assets']
aidl.srcDirs = ['src', 'assets']
renderscript.srcDirs = ['src', 'assets']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder'
buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder'
buildCommand 'com.android.ide.eclipse.adt.ApkBuilder'
// use extracted jni .so in eclipse
linkedResource name: 'libs', type: '2',
locationUri: 'PARENT-1-PROJECT_LOC/vtm-ext-libs/vtm-gdx-android'
}
lintOptions { abortOnError false }
}
task run (dependsOn: 'installDebug'){
doFirst {
println(">> adb run...")
String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb'
String cmd = "${adb} shell am start -n org.oscim.gdx/.MainActivity"
def proc = cmd.execute()
proc.in.eachLine {line -> println line}
proc.err.eachLine {line -> System.err.println( 'ERROR: ' + line)}
proc.waitFor()
}
task run(dependsOn: 'installDebug') {
doFirst {
println(">> adb run...")
String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb'
String cmd = "${adb} shell am start -n org.oscim.gdx/.MainActivity"
def proc = cmd.execute()
proc.in.eachLine { line -> println line }
proc.err.eachLine { line -> System.err.println('ERROR: ' + line) }
proc.waitFor()
}
}

129
vtm-android-start/build.gradle
View File

@ -1,108 +1,51 @@
apply plugin: 'com.android.application'
configurations {
providedCompile
eclipseCompile
}
dependencies {
compile project(':vtm-android')
compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile 'com.android.support:support-v4:22.+'
compile 'com.android.support:appcompat-v7:22.+'
//eclipseCompile project(':appcompat')
compile 'com.noveogroup.android:android-logger:1.3.4'
compile project(':vtm-android')
compile project(':vtm-themes')
compile files("${rootDir}/vtm-android/vtm-natives-android.jar")
compile 'com.android.support:support-v4:24.0.0'
compile 'com.android.support:appcompat-v7:24.0.0'
}
android {
compileSdkVersion androidTargetSdk()
buildToolsVersion "$androidBuildVersionTools"
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src', 'assets']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
compileSdkVersion androidCompileSdk()
buildToolsVersion "$androidBuildVersionTools"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
// ignore deprecated
lintOptions.abortOnError false
}
//Including configurations into Eclipse
eclipse {
// Configuring Eclipse classpath
classpath {
plusConfigurations += [ configurations.compile, configurations.eclipseCompile ]
defaultOutputDir = file('bin/classes')
containers = ['com.android.ide.eclipse.adt.ANDROID_FRAMEWORK',
'com.android.ide.eclipse.adt.LIBRARIES',
'com.android.ide.eclipse.adt.DEPENDENCIES']
file {
// Manipulation of the classpath XML before merging local
// and generated copies
beforeMerged { classpath ->
// Remove all source entries to avoid overlap
classpath.entries.removeAll() { e ->
e.kind == 'src'
}
}
// only used to explode jni .so into aar
whenMerged {
classpath ->
classpath.entries.findAll { e ->
e.path.contains('ANDROID_FRAMEWORK')
}*.exported = false
classpath.entries.removeAll() { e ->
e.path.contains('support')
}
}
// Direct manipulation of the generated classpath XML
withXml {
def node = it.asNode()
node.appendNode('classpathentry kind="src" path="src"')
node.appendNode('classpathentry kind="src" path="gen"')
}
defaultConfig {
versionCode versionCode()
versionName versionName()
minSdkVersion androidMinSdk()
}
}
project {
natures = ['com.android.ide.eclipse.adt.AndroidNature',
'org.eclipse.jdt.core.javanature']
buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder'
buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder'
buildCommand 'com.android.ide.eclipse.adt.ApkBuilder'
}
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src', 'assets']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
lintOptions { abortOnError false }
}
task run (dependsOn: 'installDebug'){
doFirst {
println(">> adb run <<")
String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb'
String cmd = "${adb} shell am start -n org.oscim.android.start/.TestActivity"
def proc = cmd.execute()
proc.in.eachLine {line -> println line}
proc.err.eachLine {line -> System.err.println( 'ERROR: ' + line)}
proc.waitFor()
}
task run(dependsOn: 'installDebug') {
doFirst {
println(">> adb run <<")
String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb'
String cmd = "${adb} shell am start -n org.oscim.android.start/.TestActivity"
def proc = cmd.execute()
proc.in.eachLine { line -> println line }
proc.err.eachLine { line -> System.err.println('ERROR: ' + line) }
proc.waitFor()
}
}

102
vtm-android/build.gradle
View File

@ -1,94 +1,38 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
configurations {
eclipseCompile
}
dependencies {
compile project(':vtm')
provided files('vtm-natives-android.jar')
compile 'com.android.support:support-v4:21.+'
//eclipseCompile project(':appcompat')
compile project(':vtm')
}
android {
compileSdkVersion androidTargetSdk()
buildToolsVersion = "$androidBuildVersionTools"
compileSdkVersion androidCompileSdk()
buildToolsVersion = "$androidBuildVersionTools"
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
lintOptions.abortOnError false
}
eclipse {
classpath {
plusConfigurations += [ configurations.compile, configurations.eclipseCompile ]
//noExportConfigurations += [ configurations.provided ]
//customizing the classes output directory:
defaultOutputDir = file('bin/classes')
containers = ['com.android.ide.eclipse.adt.ANDROID_FRAMEWORK',
'com.android.ide.eclipse.adt.LIBRARIES',
'com.android.ide.eclipse.adt.DEPENDENCIES']
file {
// Manipulation of the classpath XML before merging local
// and generated copies
beforeMerged { classpath ->
// Remove all source entries to avoid overlap
classpath.entries.removeAll() { e ->
e.kind == 'src'
}
}
// only used to explode jni .so into aar
whenMerged {
classpath ->
classpath.entries.findAll { e ->
e.path.contains('native-libs') ||
e.path.contains('ANDROID_FRAMEWORK')
}*.exported = false
classpath.entries.removeAll() { e ->
e.path.contains('support')
}
}
// Direct manipulation of the generated classpath XML
withXml {
// Since non-default source directories are used
// they need to be manually added to the classpath XML
def node = it.asNode()
// Main source directory and generated code directory
node.appendNode('classpathentry kind="src" path="src"')
node.appendNode('classpathentry kind="src" path="gen"')
}
defaultConfig {
versionCode versionCode()
versionName versionName()
minSdkVersion androidMinSdk()
}
}
project {
natures = ['com.android.ide.eclipse.adt.AndroidNature',
'org.eclipse.jdt.core.javanature']
buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder'
buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder'
buildCommand 'com.android.ide.eclipse.adt.ApkBuilder'
// use extracted jni .so in eclipse
linkedResource name: 'libs', type: '2',
locationUri: 'PARENT-1-PROJECT_LOC/vtm-ext-libs/vtm-android'
}
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}
lintOptions { abortOnError false }
}
android.libraryVariants.all { variant ->

45
vtm-desktop/build.gradle
View File

@ -1,40 +1,23 @@
repositories {
// libgdx
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'application'
mainClassName = 'org.oscim.gdx.GdxMapApp'
// package vtm native libs into jar
//task copyLibs(type: Copy) {
// from(zipTree("../vtm-ext-libs/gdx/vtm-jni-natives.jar"))
// into("${buildDir}/assets")
//}
//tasks.withType(JavaCompile) { compileTask ->
// compileTask.dependsOn copyLibs
//}
sourceSets {
main {
java.srcDirs = ['src']
//main.resources.srcDirs = ["${buildDir}/assets"]
output.resourcesDir = 'assets'
}
dependencies {
compile project(':vtm-gdx')
compile project(':vtm-themes')
compile files('vtm-natives-desktop.jar')
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.badlogicgames.gdx:gdx-backend-jglfw:$gdxVersion"
compile 'org.slf4j:slf4j-simple:1.7.21'
}
dependencies {
compile project(':vtm-gdx')
compile project(':vtm-themes')
//compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-backend-jglfw:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile 'org.slf4j:slf4j-simple:1.7.6'
compile files('vtm-natives-desktop.jar')
mainClassName = 'org.oscim.gdx.GdxMapApp'
sourceSets {
main {
java.srcDirs = ['src']
output.resourcesDir = 'assets'
}
}
run { ignoreExitValue = true }

19
vtm-extras/build.gradle
View File

@ -1,16 +1,15 @@
apply plugin: 'java'
apply plugin: 'maven'
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
}
dependencies {
compile project(':vtm')
compile 'com.google.protobuf:protobuf-java:2.4.1'
compile 'org.openstreetmap.osmosis:osmosis-osm-binary:0.43.1'
compile 'com.fasterxml.jackson.core:jackson-core:2.3.0'
compile 'com.vividsolutions:jts:1.13'
compile project(':vtm')
compile 'com.fasterxml.jackson.core:jackson-core:2.3.0'
compile 'com.google.protobuf:protobuf-java:2.4.1'
compile 'com.vividsolutions:jts:1.13'
compile 'org.openstreetmap.osmosis:osmosis-osm-binary:0.44.1'
}
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
}

18
vtm-gdx/build.gradle
View File

@ -1,17 +1,13 @@
repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
apply plugin: 'java'
apply plugin: 'maven'
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
dependencies {
compile project(':vtm')
compile project(':vtm-themes')
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
}
dependencies {
compile project(':vtm')
compile project(':vtm-themes')
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
}

71
vtm-ios/build.gradle
View File

@ -1,17 +1,14 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter()
}
dependencies {
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.1.0'
}
repositories {
jcenter()
}
dependencies {
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.1.0'
}
}
apply plugin: "java"
apply plugin: "robovm"
apply plugin: 'java'
apply plugin: 'robovm'
sourceSets.main.java.srcDirs = ["src/"]
@ -19,9 +16,9 @@ sourceCompatibility = '1.7'
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
ext {
// Configure your application main class
mainClassName = "org.oscim.ios.RoboVmLauncher"
roboVMVersion = "2.1.0"
// Configure your application main class
mainClassName = "org.oscim.ios.RoboVmLauncher"
roboVMVersion = "2.1.0"
}
launchIPhoneSimulator.dependsOn build
@ -30,43 +27,39 @@ launchIOSDevice.dependsOn build
createIPA.dependsOn build
dependencies {
compile project(':vtm')
compile project(':vtm-gdx')
compile project(':vtm-themes')
compile 'org.slf4j:slf4j-simple:1.7.5'
compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
compile project(':vtm')
compile project(':vtm-gdx')
compile project(':vtm-themes')
compile 'org.slf4j:slf4j-simple:1.7.21'
compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
}
task copyLibs(type: Copy){
from (zipTree("vtm-natives-ios.jar"))
into ("${buildDir}/natives")
task copyLibs(type: Copy) {
from(zipTree("vtm-natives-ios.jar"))
into("${buildDir}/natives")
}
task copyVtmResources(type: Copy){
from ("../vtm/resources")
into ("${buildDir}")
task copyVtmResources(type: Copy) {
from("../vtm/resources")
into("${buildDir}")
}
task copyVtmThemesResources(type: Copy){
from ("../vtm-themes/resources")
into ("${buildDir}")
task copyVtmThemesResources(type: Copy) {
from("../vtm-themes/resources")
into("${buildDir}")
}
tasks.withType(org.gradle.api.tasks.compile.JavaCompile){
compileTask -> compileTask.dependsOn copyLibs
tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
compileTask -> compileTask.dependsOn copyLibs
}
tasks.withType(org.gradle.api.tasks.compile.JavaCompile){
tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
compileTask -> compileTask.dependsOn copyVtmResources
}
tasks.withType(org.gradle.api.tasks.compile.JavaCompile){
tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
compileTask -> compileTask.dependsOn copyVtmThemesResources
}

28
vtm-jeo/build.gradle
View File

@ -1,23 +1,17 @@
apply plugin: 'java'
apply plugin: 'maven'
dependencies {
compile project(':vtm')
compile('org.jeo:jeo:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
compile('org.jeo:jeo-carto:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
}
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
main.java.srcDirs = ['src']
main.resources.srcDirs = ['src']
}
dependencies {
compile project(':vtm')
compile ('org.jeo:jeo:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
compile ('org.jeo:jeo-carto:0-SNAPSHOT') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
}
}
// eclipse.classpath.file.whenMerged { classpath ->
// classpath.entries.findAll { entry ->
// entry.path.contains('vtm-0.5.9-SNAPSHOT.jar') }*.exported = false
// }

35
vtm-playground/build.gradle
View File

@ -1,34 +1,19 @@
repositories {
// libgdx
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
apply plugin: 'java'
apply plugin: 'application'
dependencies {
compile project(':vtm-desktop')
compile project(':vtm-extras')
compile project(':vtm-jeo')
}
mainClassName = 'org.oscim.gdx.GdxMapApp'
// package vtm native libs into jar
task copyLibs(type: Copy) {
from(zipTree("../vtm-desktop/vtm-natives-desktop.jar"))
into("${buildDir}/assets")
}
tasks.withType(JavaCompile) { compileTask ->
compileTask.dependsOn copyLibs
}
sourceSets {
main {
java.srcDirs = ['src']
resources.srcDirs = ["${buildDir}/assets"]
}
}
dependencies {
compile project(':vtm-desktop')
compile project(':vtm-extras')
compile project(':vtm-jeo')
main {
java.srcDirs = ['src']
resources.srcDirs = ["${buildDir}/assets"]
}
}
run { ignoreExitValue = true }

16
vtm-tests/build.gradle
View File

@ -1,15 +1,15 @@
apply plugin: 'java'
dependencies {
compile project(':vtm')
compile 'com.squareup.okhttp:okhttp:1.5.2'
testCompile 'junit:junit:4.11'
testCompile 'org.mockito:mockito-all:1.9.5'
testCompile 'org.easytesting:fest-assert-core:2.0M10'
testCompile 'com.squareup.okhttp:mockwebserver:1.5.2'
compile project(':vtm')
compile 'com.squareup.okhttp:okhttp:1.5.2'
testCompile 'com.squareup.okhttp:mockwebserver:1.5.2'
testCompile 'junit:junit:4.11'
testCompile 'org.easytesting:fest-assert-core:2.0M10'
testCompile 'org.mockito:mockito-all:1.9.5'
}
sourceSets {
main.java.srcDirs = ['src']
test.java.srcDirs = ['test']
main.java.srcDirs = ['src']
test.java.srcDirs = ['test']
}

7
vtm-themes/build.gradle
View File

@ -1,12 +1,11 @@
apply plugin: 'java'
apply plugin: 'maven'
dependencies {
compile project(':vtm')
compile project(':vtm')
}
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['resources']
main.java.srcDirs = ['src']
main.resources.srcDirs = ['resources']
}

89
vtm-web-app/build.gradle
View File

@ -1,35 +1,34 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
}
repositories {
mavenLocal()
mavenCentral()
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
}
}
repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
apply plugin: 'war'
apply plugin: 'jetty'
apply plugin: 'gwt'
apply plugin: 'eclipse'
sourceSets {
//main.java.srcDirs = ['src', 'src/org/oscim/gdx/emu']
main.java.srcDirs = ['src']
//main.java.srcDirs = ['src', 'src/org/oscim/gdx/emu']
main.java.srcDirs = ['src']
}
dependencies {
providedCompile project(':vtm-web')
providedCompile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
providedCompile 'ru.finam:slf4j-gwt:1.2.1'
providedCompile 'org.slf4j:slf4j-api:1.7.5'
providedCompile project(':vtm-web')
providedCompile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
providedCompile 'ru.finam:slf4j-gwt:1.2.1'
providedCompile 'org.slf4j:slf4j-api:1.7.5'
}
// explicit dependencies for org.gradle.configureondemand=true
@ -38,33 +37,32 @@ evaluationDependsOn(':vtm-themes')
evaluationDependsOn(':vtm-gdx')
evaluationDependsOn(':vtm-web')
gwt {
gwtVersion='2.6.1'
modules 'org.oscim.web.VtmWebApp'
gwtVersion = '2.6.1'
modules 'org.oscim.web.VtmWebApp'
superDev {
noPrecompile=true
}
compiler {
superDev {
noPrecompile = true
}
compiler {
enableClosureCompiler = false; // activates -XenableClosureCompiler
disableClassMetadata = true; // activates -XdisableClassMetadata
disableCastChecking = true; // activates -XdisableCastChecking
}
src += files(sourceSets.main.java.srcDirs)
src += files(project(':vtm').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs)
src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-web').sourceSets.main.allJava.srcDirs)
}
src += files(sourceSets.main.java.srcDirs)
src += files(project(':vtm').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs)
src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-web').sourceSets.main.allJava.srcDirs)
}
// Run jetty with draft compiled war
task jettyDraftWar(type: JettyRunWar) {
dependsOn draftWar
dependsOn.remove('war')
webApp=draftWar.archivePath
dependsOn draftWar
dependsOn.remove('war')
webApp = draftWar.archivePath
}
task copyThemeAssets(type: Copy) {
@ -86,20 +84,7 @@ task copyWarSources(type: Copy) {
}
tasks.withType(JavaCompile) { compileTask ->
compileTask.dependsOn copyThemeAssets
compileTask.dependsOn copyVtmAssets
compileTask.dependsOn copyWarSources
}
// Configuring Eclipse classpath
eclipse.classpath {
defaultOutputDir = file('war/WEB-INF/classes')
//file {
// whenMerged { classpath ->
// classpath.entries.findAll { entry ->
// entry.path == 'src' }*.excludes = ['main','org/oscim/gdx/emu/']
// }
//}
compileTask.dependsOn copyThemeAssets
compileTask.dependsOn copyVtmAssets
compileTask.dependsOn copyWarSources
}

90
vtm-web-js/build.gradle
View File

@ -1,36 +1,35 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
}
repositories {
mavenLocal()
mavenCentral()
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
}
}
repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
apply plugin: 'war'
apply plugin: 'jetty'
apply plugin: 'gwt'
apply plugin: 'eclipse'
sourceSets {
main.java.srcDirs = ['src']
main.java.srcDirs = ['src']
}
dependencies {
providedCompile project(':vtm-web')
providedCompile project(':vtm-extras')
providedCompile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
providedCompile 'ru.finam:slf4j-gwt:1.2.1'
providedCompile 'org.slf4j:slf4j-api:1.7.5'
providedCompile 'org.timepedia.exporter:gwtexporter:2.5.0-SNAPSHOT'
providedCompile project(':vtm-web')
providedCompile project(':vtm-extras')
providedCompile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
providedCompile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
providedCompile 'ru.finam:slf4j-gwt:1.2.1'
providedCompile 'org.slf4j:slf4j-api:1.7.5'
providedCompile 'org.timepedia.exporter:gwtexporter:2.5.0-SNAPSHOT'
}
// explicit dependencies for org.gradle.configureondemand=true
@ -40,31 +39,31 @@ evaluationDependsOn(':vtm-gdx')
evaluationDependsOn(':vtm-web')
gwt {
gwtVersion='2.6.1'
modules 'org.oscim.web.VtmWebJs'
gwtVersion = '2.6.1'
modules 'org.oscim.web.VtmWebJs'
superDev {
noPrecompile=true
}
compiler {
superDev {
noPrecompile = true
}
compiler {
enableClosureCompiler = false; // activates -XenableClosureCompiler
disableClassMetadata = true; // activates -XdisableClassMetadata
disableCastChecking = true; // activates -XdisableCastChecking
}
src += files(sourceSets.main.java.srcDirs)
src += files(project(':vtm').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs)
src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-web').sourceSets.main.allJava.srcDirs)
}
src += files(sourceSets.main.java.srcDirs)
src += files(project(':vtm').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs)
src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-web').sourceSets.main.allJava.srcDirs)
}
// Run jetty with draft compiled war
task jettyDraftWar(type: JettyRunWar) {
dependsOn draftWar
//dependsOn.remove('war')
webApp=draftWar.archivePath
dependsOn draftWar
//dependsOn.remove('war')
webApp = draftWar.archivePath
}
task copyThemeAssets(type: Copy) {
@ -88,20 +87,7 @@ task copyWarSources(type: Copy) {
}
tasks.withType(JavaCompile) { compileTask ->
compileTask.dependsOn copyThemeAssets
compileTask.dependsOn copyVtmAssets
compileTask.dependsOn copyWarSources
}
// Configuring Eclipse classpath
eclipse.classpath {
defaultOutputDir = file('war/WEB-INF/classes')
//file {
// whenMerged { classpath ->
// classpath.entries.findAll { entry ->
// entry.path == 'src' }*.excludes = ['main','org/oscim/gdx/emu/']
// }
//}
compileTask.dependsOn copyThemeAssets
compileTask.dependsOn copyVtmAssets
compileTask.dependsOn copyWarSources
}

74
vtm-web/build.gradle
View File

@ -1,36 +1,35 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
}
repositories {
mavenLocal()
mavenCentral()
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
}
}
repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
//apply plugin: 'war'
//apply plugin: 'jetty'
apply plugin: 'java'
apply plugin: 'gwt-base'
apply plugin: 'eclipse'
sourceSets {
main.java.srcDirs = ['src', 'src/org/oscim/gdx/emu']
main.java.srcDirs = ['src', 'src/org/oscim/gdx/emu']
}
dependencies {
compile project(':vtm-gdx')
compile project(':vtm-extras')
compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
compile 'ru.finam:slf4j-gwt:1.2.1'
compile 'org.slf4j:slf4j-api:1.7.5'
compile project(':vtm-gdx')
compile project(':vtm-extras')
compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
compile 'ru.finam:slf4j-gwt:1.2.1'
compile 'org.slf4j:slf4j-api:1.7.5'
}
// explicit dependencies for org.gradle.configureondemand=true
@ -40,23 +39,23 @@ evaluationDependsOn(':vtm-gdx')
evaluationDependsOn(':vtm-extras')
gwt {
gwtVersion='2.6.1'
modules 'org.oscim.gdx.VtmWeb'
gwtVersion = '2.6.1'
modules 'org.oscim.gdx.VtmWeb'
superDev {
noPrecompile=true
}
compiler {
superDev {
noPrecompile = true
}
compiler {
enableClosureCompiler = false; // activates -XenableClosureCompiler
disableClassMetadata = true; // activates -XdisableClassMetadata
disableCastChecking = true; // activates -XdisableCastChecking
}
src += files(sourceSets.main.java.srcDirs)
src += files(project(':vtm').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs)
src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs)
}
src += files(sourceSets.main.java.srcDirs)
src += files(project(':vtm').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.allJava.srcDirs)
src += files(project(':vtm-themes').sourceSets.main.resources.srcDirs)
src += files(project(':vtm-gdx').sourceSets.main.allJava.srcDirs)
}
// Run jetty with draft compiled war
@ -82,16 +81,3 @@ gwt {
// compileTask.dependsOn copyThemeAssets
// compileTask.dependsOn copyVtmAssets
//}
// Configuring Eclipse classpath
eclipse.classpath {
defaultOutputDir = file('war/WEB-INF/classes')
file {
whenMerged { classpath ->
classpath.entries.findAll { entry ->
entry.path == 'src' }*.excludes = ['main','org/oscim/gdx/emu/']
}
}
}

35
vtm/build.gradle
View File

@ -4,35 +4,14 @@ apply plugin: 'maven'
configurations { providedCompile }
dependencies {
compile 'org.slf4j:slf4j-api:1.7.6'
compile 'com.vividsolutions:jts:1.13'
providedCompile 'com.squareup.okhttp:okhttp:1.5.2'
providedCompile 'com.google.code.findbugs:annotations:2.0.1'
compile 'com.vividsolutions:jts:1.13'
compile 'org.slf4j:slf4j-api:1.7.21'
providedCompile 'com.google.code.findbugs:annotations:2.0.1'
providedCompile 'com.squareup.okhttp:okhttp:1.5.2'
}
sourceSets {
main.java.srcDirs = ['src']
main.resources.srcDirs = ['resources']
main.compileClasspath += configurations.providedCompile
}
eclipse.classpath {
//you can tweak the classpath of the Eclipse project by adding extra configurations:
plusConfigurations += [ configurations.providedCompile ]
file.whenMerged { classpath ->
classpath.entries.findAll { entry ->
entry.path.contains('annotations') ||
entry.path.contains('okhttp') ||
entry.path.contains('okio')
}*.exported = false
}
//if you don't want some classpath entries 'exported' in Eclipse
noExportConfigurations += [ configurations.providedCompile ]
//default settings for downloading sources and Javadoc:
//downloadSources = true
//downloadJavadoc = false
main.java.srcDirs = ['src']
main.resources.srcDirs = ['resources']
main.compileClasspath += configurations.providedCompile
}