diff options
| -rw-r--r-- | hello_sdl_java_ee/settings.gradle | 2 | ||||
| -rw-r--r-- | javaEE/build.gradle | 10 | ||||
| -rw-r--r-- | javaEE/settings.gradle | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/hello_sdl_java_ee/settings.gradle b/hello_sdl_java_ee/settings.gradle index 349e839a3..8a8a05513 100644 --- a/hello_sdl_java_ee/settings.gradle +++ b/hello_sdl_java_ee/settings.gradle @@ -1,3 +1,3 @@ rootProject.name = 'hello_sdl_java_ee' include ":sdl_java_ee" -project (":sdl_java_ee").projectDir = new File("../javaEE/")
\ No newline at end of file +project (":sdl_java_ee").projectDir = new File(rootProject.projectDir, "../javaEE/")
\ No newline at end of file diff --git a/javaEE/build.gradle b/javaEE/build.gradle index a1f825d88..bc0554c0e 100644 --- a/javaEE/build.gradle +++ b/javaEE/build.gradle @@ -27,12 +27,18 @@ configurations { dependencies { extraLibs fileTree(dir: 'libs', include: ['*.jar']) - extraLibs project(path: ':javaSE') + extraLibs fileTree(dir: '../javaSE/libs', include: ['*.jar']) //BSON lib + extraLibs 'com.android.support:support-annotations:28.0.0' + extraLibs 'org.java-websocket:Java-WebSocket:1.3.9' configurations.api.extendsFrom(configurations.extraLibs) } +sourceSets { + main.java.srcDirs += '../base/src/main/java' + main.java.srcDirs += '../javaSE/src/main/java' +} + jar { - dependsOn ':javaSE:jar' from { configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) } } diff --git a/javaEE/settings.gradle b/javaEE/settings.gradle index 8571d75ae..4da4ab327 100644 --- a/javaEE/settings.gradle +++ b/javaEE/settings.gradle @@ -1,2 +1 @@ -include ':javaEE' , ':javaSE' -project (":javaSE").projectDir = new File("../javaSE")
\ No newline at end of file +rootProject.name = 'javaEE' |