Update build files

NTNU-IHB · Oct 2, 2019 · f6ed3eb · f6ed3eb
1 parent a9ebe0b
commit f6ed3eb
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/java/fmi4j/build.gradle b/java/fmi4j/build.gradle
@@ -13,22 +13,14 @@ wrapper {
 subprojects { sub ->
 
     group = 'no.ntnu.ihb.fmi4j'
-    version = '0.24.1'
+    version = '0.24.2'
 
     pluginManager.withPlugin('java') {
 
         repositories {
             mavenCentral()
         }
 
-        dependencies {
-
-            def slf4j_version = '1.7.25'
-            implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j_version
-            runtimeOnly group: 'org.slf4j', name: 'slf4j-log4j12', version: slf4j_version
-
-        }
-
         pluginManager.withPlugin('kotlin') {
 
             compileKotlin {

diff --git a/java/fmi4j/fmi-export/build.gradle b/java/fmi4j/fmi-export/build.gradle
@@ -13,13 +13,15 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 
-    compile project(':fmi-md')
+    api project(':fmi-md')
 
 }
 
 jar {
     from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.compile.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
     }
 }
 

diff --git a/java/fmi4j/fmi-import/build.gradle b/java/fmi4j/fmi-import/build.gradle
@@ -6,6 +6,7 @@ plugins {
 
 apply plugin: 'kotlin'
 
+apply from: rootProject.file("gradle/log4j.gradle")
 apply from: rootProject.file("gradle/junit.gradle")
 apply from: rootProject.file("gradle/copyfmus.gradle")
 apply from: rootProject.file("gradle/mavenpublish.gradle")

diff --git a/java/fmi4j/fmu-driver/build.gradle b/java/fmi4j/fmu-driver/build.gradle
@@ -7,6 +7,7 @@ plugins {
 apply plugin: 'java'
 apply plugin: 'kotlin'
 
+apply from: rootProject.file("gradle/log4j.gradle")
 apply from: rootProject.file(("gradle/junit.gradle"))
 
 def group = "no.ntnu.ihb.fmi4j.driver"

diff --git a/java/fmi4j/fmu-slaves/build.gradle b/java/fmi4j/fmu-slaves/build.gradle
@@ -14,6 +14,8 @@ dependencies {
 jar {
     archiveName("${project.name}.jar")
     from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.compile.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
     }
 }
diff --git a/java/fmi4j/gradle/log4j.gradle b/java/fmi4j/gradle/log4j.gradle
@@ -0,0 +1,8 @@
+
+dependencies {
+
+    def slf4j_version = '1.7.25'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4j_version
+    runtimeOnly group: 'org.slf4j', name: 'slf4j-log4j12', version: slf4j_version
+
+}