From c7c69b6294cb2759380525cd27cdce2569ed6360 Mon Sep 17 00:00:00 2001
From: Stefan Feuerhahn <stefan.feuerhahn@beanit.com>
Date: Mon, 2 Sep 2019 18:11:50 +0200
Subject: [PATCH] moved jar config in afterEvaluate

---
 build.gradle         | 12 +++++++-----
 configuration.gradle |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index ebd12db..26cf2e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,11 +59,13 @@ configure(javaProjects) {
         useJUnitPlatform()
     }
 
-    jar {
-        inputs.property("moduleName", moduleName)
-        manifest {
-            version = project.version.replace("-", ".")
-            attributes('Automatic-Module-Name': moduleName)
+    afterEvaluate {
+        jar {
+            inputs.property("moduleName", moduleName)
+            manifest {
+                version = project.version.replace("-", ".")
+                attributes('Automatic-Module-Name': moduleName)
+            }
         }
     }
 
diff --git a/configuration.gradle b/configuration.gradle
index c21f8b0..ab31b3a 100644
--- a/configuration.gradle
+++ b/configuration.gradle
@@ -76,11 +76,11 @@ dependencies {
     runtimeOnly group: "ch.qos.logback", name: "logback-classic", version: "1.2.3"
 }
 
-ext.moduleName = 'com.beanit.openiec61850'
+ext.moduleName = "com.beanit.openiec61850"
 
 jar {
     bnd("Bundle-Name": "OpenIEC61850",
-            "Bundle-SymbolicName": "com.beanit.openiec61850",
+            "Bundle-SymbolicName": moduleName,
             "-exportcontents": "!*.internal.*,*",
             "Import-Package": "com.beanit.jasn1.*,javax.net,*;resolution:=optional")
 }