Merge pull request #4111 from rjhancock/java-17

Work towards Java 17
MegaMek · Jun 29, 2024 · c025250 · c025250
2 parents 70f9cb4 + fcc420a
commit c025250
Show file tree

Hide file tree

Showing 16 changed files with 591 additions and 512 deletions.
diff --git a/.github/build-scan-init.gradle b/.github/build-scan-init.gradle
@@ -23,30 +23,19 @@ initscript {
 def isTopLevelBuild = gradle.getParent() == null
 
 if (isTopLevelBuild) {
-    def gradleVersion = GradleVersion.current().baseVersion
-    def atLeastGradle5 = gradleVersion >= GradleVersion.version("5.0")
-    def atLeastGradle6 = gradleVersion >= GradleVersion.version("6.0")
-
-    if (atLeastGradle6) {
-        settingsEvaluated {
-            if (!it.pluginManager.hasPlugin("com.gradle.enterprise")) {
-                it.pluginManager.apply(GradleEnterprisePlugin)
-            }
-            configureExtension(it.extensions["gradleEnterprise"])
-        }
-    } else if (atLeastGradle5) {
-        rootProject {
-            pluginManager.apply(BuildScanPlugin)
-            configureExtension(extensions["gradleEnterprise"])
+    settingsEvaluated {
+        if (!it.pluginManager.hasPlugin("com.gradle.enterprise")) {
+            it.pluginManager.apply(GradleEnterprisePlugin)
         }
+        configureExtension(it.extensions["gradleEnterprise"])
     }
 }
 
 void configureExtension(extension) {
     extension.buildScan.with {
         termsOfServiceUrl = "https://gradle.com/terms-of-service"
         termsOfServiceAgree = "yes"
-        
+
         //
         // After the build scan is published, put on STDOUT the special
         // GitHub Actions syntax to set an Output Variable for the job
@@ -57,7 +46,7 @@ void configureExtension(extension) {
         // ref: https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-output-parameter
         //
         buildScanPublished { PublishedBuildScan scan ->
-            println "::set-output name=buildScanUri::${scan.buildScanUri}\n"
+            echo "name=buildScanUri::${scan.buildScanUri}\n" >> $GITHUB_OUTPUT
         }
     }
 }
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -4,16 +4,16 @@ coverage:
   status:
     project:
       default:
-        target: auto  # auto compares coverage to the previous base commit
-        threshold: 1%  # the leniency in hitting the target
-        informational: true  # makes project checks informational only, not failing
+        target: auto # auto compares coverage to the previous base commit
+        threshold: 1% # the leniency in hitting the target
+        informational: true # makes project checks informational only, not failing
 
     patch:
       default:
-        informational: true  # makes patch checks informational only, not failing
+        informational: true # makes patch checks informational only, not failing
 
 fixes:
-  - "mekhq/::"        # reduce root e.g., "before/path/" => "path/"
+  - "mekhq/::" # reduce root e.g., "before/path/" => "path/"
 
 ignore:
   - "megamek"
@@ -22,4 +22,3 @@ ignore:
 github_checks:
   # https://docs.codecov.io/docs/github-checks-beta#disabling-github-checks-patch-annotations-via-yaml
   annotations: false
-