Merge pull request #4 from clojurephant/update

Resolve hardcoded Java home

Author: ajoberstar

.github/workflows/ci.yaml

@@ -10,33 +10,25 @@ jobs:
   ci:
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    env:
-      GRADLE_OPTS: -Dorg.gradle.java.installations.fromEnv=JAVA_HOME_8_x64,JAVA_HOME_11_x64,JAVA_HOME_17_x64
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java 8
+      - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 8
-      - name: Setup Java 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 11
-      - name: Setup Java 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: 17
+          java-version: |
+            8
+            11
+            17
+            21
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Gradle check
-        run: ./gradlew check --scan
+        run: ./gradlew check

.github/workflows/release.yaml

@@ -8,24 +8,23 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup Java 11
-        uses: actions/setup-java@v2
+      - name: Setup Java
+        uses: actions/setup-java@v3
         with:
-          distribution: zulu
-          java-version: 11
-      - name: Setup Java 17
-        uses: actions/setup-java@v2
-        with:
-          distribution: zulu
-          java-version: 17
+          distribution: temurin
+          java-version: |
+            8
+            11
+            17
+            21
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Gradle publish
         env:
           CLOJARS_USER: ${{ secrets.CLOJARS_USER }}
           CLOJARS_TOKEN: ${{ secrets.CLOJARS_TOKEN }}
-        run: ./gradlew publish --scan
+        run: ./gradlew publish

build.gradle.kts

@@ -2,19 +2,10 @@ plugins {
   id("dev.clojurephant.clojure")
   id("java-library")
   id("maven-publish")
-
-  id("org.ajoberstar.reckon")
 }
 
 group = "dev.clojurephant"
 
-reckon {
-  setDefaultInferredScope("patch")
-  stages("alpha", "beta", "rc", "final")
-  setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages()))
-  setStageCalc(calcStageFromProp())
-}
-
 java {
   toolchain {
     languageVersion.set(JavaLanguageVersion.of(8))
@@ -34,11 +25,11 @@ dependencies {
   api("org.clojure:clojure:1.11.1")
 
   // gradle
-  compileOnly("org.gradle:gradle-tooling-api:7.5")
+  compileOnly("org.gradle:gradle-tooling-api:8.5")
 
   // clojurescript and nrepl
-  api("org.clojure:clojurescript:1.11.60")
-  api("nrepl:nrepl:0.9.0")
+  api("org.clojure:clojurescript:1.11.121")
+  api("nrepl:nrepl:1.1.0")
   api("cider:piggieback:0.5.3")
 
   // figwheel repl
@@ -50,20 +41,19 @@ dependencies {
   "figwheelMainApi"("com.bhauman:figwheel-main:0.2.18")
 
   // testing
-  testRuntimeOnly("org.ajoberstar:jovial:0.3.0")
-  devRuntimeOnly("org.slf4j:slf4j-simple:1.7.36")
+  testRuntimeOnly("dev.clojurephant:jovial:0.4.2")
+  devRuntimeOnly("org.slf4j:slf4j-simple:2.0.10")
 }
 
 tasks.withType<Test>() {
   useJUnitPlatform()
 }
 
 tasks.named<Jar>("jar") {
-  dependsOn(configurations.compileClasspath)
-  from({
-    configurations.compileClasspath.files { dep ->
-      dep.getGroup() == "org.gradle"
-    }.map {
+  from(configurations.compileClasspath.get().map {
+    if (it.isDirectory()) {
+      it
+    } else {
       zipTree(it).matching { include("org/gradle/**/*") }
     }
   })
@@ -104,7 +94,7 @@ publishing {
 
         licenses {
           license {
-            name.set("Apache License 2.0")
+            name.set("Apache-2.0")
             url.set("https://github.com/clojurephant/jovial/blob/main/LICENSE")
           }
         }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -1,8 +1,27 @@
 pluginManagement {
   plugins {
-    id("dev.clojurephant.clojure") version("0.7.0-rc.1")
-    id("org.ajoberstar.reckon") version("0.16.1")    
+    id("dev.clojurephant.clojure") version("0.8.0-beta.4")
+    id("org.ajoberstar.reckon.settings") version("0.18.2")
   }
+
+  repositories {
+    mavenCentral()
+    maven {
+      name = "Clojars"
+      url = uri("https://repo.clojars.org/")
+    }
+  }
+}
+
+plugins {
+  id("org.ajoberstar.reckon.settings")
+}
+
+extensions.configure<org.ajoberstar.reckon.gradle.ReckonExtension> {
+  setDefaultInferredScope("patch")
+  stages("beta", "rc", "final")
+  setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages()))
+  setStageCalc(calcStageFromProp())
 }
 
 dependencyResolutionManagement {
@@ -24,4 +43,3 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "clojurephant-tooling"
-    

settings.gradle.kts

@@ -58,7 +58,7 @@
         db (atom [])]
     (-> (.newBuild con)
         (.forTasks (into-array String tasks))
-        (.setJavaHome (io/file "/usr/lib/jvm/java-18-openjdk-amd64"))
+        ;(.setJavaHome (io/file "/usr/lib/jvm/java-18-openjdk-amd64"))
         (.setStandardOutput System/out)
         (.setStandardError System/err)
         (.addProgressListener (collecting-listener db))
@@ -90,7 +90,7 @@
                         (and (= :task (get-in e [:operation :descriptor]))
                              (= :finish (:state e))))
          simplify (fn [t]
-                    (merge 
+                    (merge
                      {:task (-> t :operation :name)}
                      (:result t)))]
      (->> (:events result)
@@ -108,7 +108,7 @@
         done (promise)
         db (atom [])]
     (-> (.model con type)
-        (.setJavaHome (io/file "/usr/lib/jvm/java-18-openjdk-amd64"))
+        ;(.setJavaHome (io/file "/usr/lib/jvm/java-18-openjdk-amd64"))
         (.setStandardOutput System/out)
         (.setStandardError System/err)
         (.withCancellationToken (.token cancel-source))