fixing gradle build

arcuri82 · arcuri82 · commit b8f921912ec4 · 2023-09-24T22:05:34.000+02:00
diff --git a/README.md b/README.md
@@ -72,7 +72,9 @@ More details (e.g., #LOCs and used databases) on these APIs can be found [in thi
 
 ### REST: Java/Kotlin
 
-* Reservations API (not-known license), [jdk_11_gradle/cs/rest/reservations-api](jdk_11_gradle/cs/rest/reservations-api) , from [https://github.com/cyrilgavala/reservations-api](https://github.com/cyrilgavala/reservations-api)
+* Bibliothek (MIT), [jdk_17_gradle/cs/rest/bibliothek](jdk_17_gradle/cs/rest/bibliothek), from [https://github.com/PaperMC/bibliothek](https://github.com/PaperMC/bibliothek)
+
+* Reservations API (not-known license), [jdk_11_gradle/cs/rest/reservations-api](jdk_11_gradle/cs/rest/reservations-api), from [https://github.com/cyrilgavala/reservations-api](https://github.com/cyrilgavala/reservations-api)
 
 * Genome Nexus (MIT), [jdk_8_maven/cs/rest-gui/genome-nexus](jdk_8_maven/cs/rest-gui/genome-nexus), from [https://github.com/genome-nexus/genome-nexus](https://github.com/genome-nexus/genome-nexus)
 
diff --git a/jdk_11_gradle/build.gradle b/jdk_11_gradle/build.gradle
@@ -0,0 +1,6 @@
+
+allprojects {
+    ext {
+        EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
+    }
+}
diff --git a/jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts b/jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts
@@ -29,7 +29,7 @@ dependencyManagement  {
     }
 }
 
-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")
 
 dependencies{
     implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")
diff --git a/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts b/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts
@@ -29,7 +29,7 @@ java {
 //    }
 //}
 
-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")
 
 dependencies{
     implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")
diff --git a/jdk_11_gradle/em/external/graphql/patio-api/build.gradle.kts b/jdk_11_gradle/em/external/graphql/patio-api/build.gradle.kts
@@ -37,7 +37,7 @@ dependencyManagement  {
     }
 }
 
-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")
 
 dependencies{
     implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")
diff --git a/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts b/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts
@@ -33,7 +33,7 @@ java {
 //    }
 //}
 
-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")
 
 dependencies{
     implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")
diff --git a/jdk_17_gradle/build.gradle b/jdk_17_gradle/build.gradle
@@ -0,0 +1,6 @@
+
+allprojects {
+    ext {
+        EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
+    }
+}
diff --git a/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts
@@ -21,8 +21,7 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-
-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")
 
 dependencies{
     implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")
diff --git a/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts
@@ -25,7 +25,7 @@ java {
 }
 
 
-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")
 
 dependencies{
     implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")
diff --git a/scripts/dist.py b/scripts/dist.py
@@ -228,6 +228,29 @@ def build_jdk_11_gradle():
     copy(folder + "/cs/rest/reservations-api/build/libs/reservations-api-sut.jar", DIST)
     copy(folder + "/em/external/rest/reservations-api/build/libs/reservations-api-evomaster-runner.jar", DIST)
 
+####################
+def build_jdk_17_gradle():
+    env_vars = os.environ.copy()
+    env_vars["JAVA_HOME"] = JAVA_HOME_17
+    folder = "jdk_17_gradle"
+
+    command = "gradlew"
+
+    if platform.system() == "Darwin":
+        command = "./gradlew"
+
+    gradleres = run([command, "build", "-x", "test"], shell=SHELL, cwd=os.path.join(PROJ_LOCATION, folder),
+                    env=env_vars)
+    gradleres = gradleres.returncode
+
+    if gradleres != 0:
+        print("\nERROR: Gradle command failed")
+        exit(1)
+
+    # Copy JAR files
+    copy(folder + "/cs/rest/bibliothek/build/libs/bibliothek-sut.jar", DIST)
+    copy(folder + "/em/external/rest/bibliothek/build/libs/bibliothek-evomaster-runner.jar", DIST)
+
 
 # Building JavaScript projects
 def buildJS(path, name):
@@ -320,6 +343,7 @@ def makeZip():
 build_jdk_11_maven()
 build_jdk_17_maven()
 build_jdk_11_gradle()
+build_jdk_17_gradle()
 
 ## Those are disabled for now... might support back in the future
 # build_js_npm()
diff --git a/scripts/version.py b/scripts/version.py
@@ -68,9 +68,9 @@ def replaceInProperty(file):
     replacement = 'EVOMASTER_VERSION='+version+'\n'
     replace(file, regex, replacement)
 
-def replaceInKotlinGradle(file):
-    regex = re.compile(r'.*val.*EVOMASTER_VERSION.*=.*')
-    replacement = "val EVOMASTER_VERSION = \""+version+"\"\n"
+def replaceInGradle(file):
+    regex = re.compile(r'.*EVOMASTER_VERSION.*=.*')
+    replacement = "        EVOMASTER_VERSION = \""+version+"\"\n"
     replace(file, regex, replacement)
 
 def versionSetMaven(folder, jdk_home):
@@ -124,9 +124,8 @@ def replaceInCS():
 replaceInPom("jdk_11_maven/pom.xml")
 replaceInPom("jdk_17_maven/pom.xml")
 
-# is there any easier way for Gradle?
-replaceInKotlinGradle("jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts")
-replaceInKotlinGradle("jdk_11_gradle/em/external/graphql/patio-api/build.gradle.kts")
+replaceInGradle("jdk_17_gradle/build.gradle")
+replaceInGradle("jdk_11_gradle/build.gradle")
 
 replaceInDist()
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
++
 +allprojects {
 +    ext {
 +        EVOMASTER_VERSION = "1.6.2-SNAPSHOT"
 +    }
 +}
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ dependencyManagement {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"`
	`32`	`+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")`
`33`	`33`
`34`	`34`	`dependencies{`
`35`	`35`	`implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ dependencyManagement {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"`
	`40`	`+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")`
`41`	`41`
`42`	`42`	`dependencies{`
`43`	`43`	`implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ java {`
`21`	`21`	`targetCompatibility = JavaVersion.VERSION_17`
`22`	`22`	`}`
`23`	`23`
`24`		`-`
`25`		`-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"`
	`24`	`+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")`
`26`	`25`
`27`	`26`	`dependencies{`
`28`	`27`	`implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ java {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`
`28`		`-val EVOMASTER_VERSION = "1.6.2-SNAPSHOT"`
	`28`	`+val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION")`
`29`	`29`
`30`	`30`	`dependencies{`
`31`	`31`	`implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION")`