changed way the project from git submodule is embedded in gradle buil…

…d process. This solves a problem with eclipse integration
KeenWarrior · Aug 9, 2017 · 674f2b7 · 674f2b7
1 parent f830f7a
commit 674f2b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-sourceSets.main.java.srcDirs = ['src']
+sourceSets.main.java.srcDirs = ['dependencies/public-transport-enabler/enabler/src', 'src']
 sourceSets.main.resources.srcDirs = ['conf/logs']
 sourceSets.test.java.srcDirs = ['test']
 
@@ -72,8 +72,10 @@ dependencies {
   compile group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet-core', version: versionJersey
   compile group: 'org.webjars', name: 'swagger-ui', version: '2.1.4'
 
-  compile(project(':dependencies:public-transport-enabler:enabler')) {	}
-
+  // the following is required for public-transport-enabler
+  compile 'com.squareup.okhttp3:okhttp:3.8.0'
+  compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
+  compile 'net.sf.kxml:kxml2:2.3.0' // provided by Android
 }
 
 task stage(dependsOn: ['assemble', 'clean'])

diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
 rootProject.name = 'susi_server'
-include ':dependencies:public-transport-enabler:enabler'
+
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		rootProject.name = 'susi_server'
		include ':dependencies:public-transport-enabler:enabler'