Merge pull request #1479 from TNG/update-gradle-syntax

Update gradle syntax to comply to gradle 9.0 standard
TNG · Dec 12, 2023 · 1736cca · 1736cca
2 parents 36b896b + 542ec2f
commit 1736cca
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,6 @@ plugins {
 }
 
 
-
 apply plugin: 'project-report'
 
 description = 'JGiven - BDD in plain Java'
@@ -137,8 +136,6 @@ configure(subprojects.findAll { !it.name.contains("android") }) {
     apply plugin: 'org.asciidoctor.jvm.convert'
     apply plugin: 'maven-publish'
 
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
-
     dependencies {
         implementation libs.slf4j.api
 
@@ -180,19 +177,23 @@ configure(subprojects.findAll { !it.name.contains("android") }) {
 
     tasks.withType(Jar) {
         def now = new Date()
-        manifest = project.manifest().attributes(
-                'Built-By': "Gradle ${gradle.gradleVersion}",
-                'Build-Date': now.format('yyyy-MM-dd HH:mm:ss.S'),
-                'Copyright': "2013-" + now.format('yyyy') + " TNG Technology Consulting GmbH",
-                'Implementation-Title': project.name,
+        manifest {
+            attributes(
+                'Built-By'              : "Gradle ${gradle.gradleVersion}",
+                'Build-Date'            : now.format('yyyy-MM-dd HH:mm:ss.S'),
+                'Copyright'             : "2013-" + now.format('yyyy') + " TNG Technology Consulting GmbH",
+                'Implementation-Title'  : project.name,
                 'Implementation-Version': project.version,
-                'Implementation-Vendor': 'TNG Technology Consulting GmbH',
-                'License': 'Apache License v2.0, January 2004',
-                'Specification-Title': project.name,
-                'Specification-Version': project.version,
-                'Specification-Vendor': 'TNG Technology Consulting GmbH',
-                'Automatic-Module-Name' : "com.tngtech.jgiven.${project.name.replaceAll("-",".").replace("jgiven.","")}"
-        )
+                'Implementation-Vendor' : 'TNG Technology Consulting GmbH',
+                'License'               : 'Apache License v2.0, January 2004',
+                'Specification-Title'   : project.name,
+                'Specification-Version' : project.version,
+                'Specification-Vendor'  : 'TNG Technology Consulting GmbH',
+                'Automatic-Module-Name' : "com.tngtech.jgiven.${project.name.replaceAll("-", ".").replace("jgiven.", "")}"
+            )
+        }
+
+
     }
 
     normalization {
@@ -210,6 +211,7 @@ configure(subprojects.findAll { !it.name.contains("android") }) {
     }
 
     java {
+        sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
         withJavadocJar()
         withSourcesJar()
     }

diff --git a/jgiven-future-java-tests/build.gradle b/jgiven-future-java-tests/build.gradle
@@ -1,5 +1,9 @@
-apply plugin: 'java'
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_19
+plugins {
+    id 'java'
+}
+java {
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_19
+}
 
 dependencies {
     testImplementation project(':jgiven-core')