[pull] master from sdkman:master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,13 +7,13 @@ assignees: ''
 
 ---
 <!-- DO NOT DELETE THIS TEMPLATE AND PLEASE READ IT WITH CARE! -->
-<!-- Thank you for using the SDKMAN! issue tracker. Please fill in everything to the best of your ability. If you are unsure if it is a bug, then please use our Slack user-issues channel before creating a new issue. Please understand that we cannot offer regular support through GitHub issues and will close the issue if it is not an actual bug. -->
+<!-- Thank you for using the SDKMAN! issue tracker. Please fill in everything to the best of your ability. If you need clarification on whether it is a bug, please use our #help Discord channel before creating a new issue. Please know that we cannot offer regular support through GitHub issues and will close the issue without warning if it is not a bug. -->
 
 **Bug report**
 <!-- A clear and concise description of the bug you encountered  -->
 
 **To reproduce**
-<!-- Steps to reproduce the behavior or verify the issue -->
+<!-- Steps to reproduce the behaviour or verify the issue -->
 
 **System info**
 <!-- Please add relevant information about your system:

.github/ISSUE_TEMPLATE/config.yml

@@ -3,9 +3,9 @@ contact_links:
   - name: SDKMAN! usage documentation
     url: https://sdkman.io/usage
     about: Find documentation about the available commands here.
-  - name: SDKMAN! Slack community
-    url: https://slack.sdkman.io/
-    about: Please ask and answer questions about usage of SDKMAN! here.
+  - name: SDKMAN! Discord server
+    url: https://discord.gg/y9mVJYVyu4
+    about: Please ask and answer questions about the usage of SDKMAN! here.
   - name: SDKMAN! on Stack Overflow
     url: https://stackoverflow.com/questions/tagged/sdkman
     about: You might find help to common issues here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,11 +6,11 @@ labels: 'enhancement'
 assignees: ''
 ---
 
-<!-- Thank you for suggesting a new feature. Please discuss your idea on our #cli-development Slack channel before requesting a new feature. -->
+<!-- Thank you for suggesting a new feature. Please discuss your idea on our #discussions Discord channel before requesting a new feature. -->
 
 - [ ] I have read the [CONTRIBUTING guidelines](CONTRIBUTING.md)
-- [ ] I've had a conversation on the [#cli-development](https://sdkman.slack.com/app_redirect?channel=cli-development) Slack channel about this request.
+- [ ] I've had a conversation on our community [Discord](https://discord.gg/y9mVJYVyu4) server.
 
 **Feature request**
-<!-- A clear and precise description of what new or changed feature you want. Please include the reason, why you would need the feature. E.g. what problem does it solve? Or which workflow is currently frustrating and will be improved by this? -->
+<!-- A clear and precise description of your desired new or changed feature. Please include the reason why you would need the feature. E.g. what problem does it solve? Or which workflow is currently frustrating and will be improved by this? -->
 

.github/ISSUE_TEMPLATE/support_request.md

@@ -6,13 +6,13 @@ labels: 'support'
 assignees: ''
 
 ---
-<!-- Thank you for using SDKMAN!. We want to help users using the software, but we also try to avoid filling the issue tracker with too many support requests. We kindly ask you to use our Slack channel #user-issues before posting.
+<!-- Thank you for using SDKMAN!. We want to help users using the software but also avoid filling the issue tracker with too many support requests. Please talk to us on our Discord server before posting.
 
-Please consider the following things. Note, that ignoring all of these might lead to the issue simply being closed. -->
+Please consider the following things. Just so you know, ignoring any of these might lead to the issue being closed abruptly. -->
 
 - [ ] I have checked [the documentation](https://sdkman.io/usage)
-- [ ] I have done a quick search in [past issues](https://github.com/rclone/rclone/issues?q=) or [Stack Overflow](https://stackoverflow.com/questions/tagged/sdkman) for similar problems
-- [ ] I have brought up a conversation in the [Slack User Issues Channel](https://sdkman.slack.com/app_redirect?channel=user-issues)
+- [ ] I have performed a quick search in [past issues](https://github.com/sdkman/sdkman-cli/issues?q=) or [Stack Overflow](https://stackoverflow.com/questions/tagged/sdkman) for similar problems
+- [ ] I have brought up a conversation in the community [Discord](https://discord.gg/y9mVJYVyu4) server
 
 **Question**
 <!-- A clear and concise description of the issue you are encountering -->

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/beta.yml

@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - master
+    paths-ignore:
+      - .github/workflows/*
 
 jobs:
   pre-release:
@@ -15,11 +17,12 @@ jobs:
         ports:
           - 27017:27017
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
+          cache: 'gradle'
       - name: Run tests
         run: ./gradlew clean test --info
       - name: Set short git hash

.github/workflows/pr.yml

@@ -5,15 +5,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
             ref: ${{ github.event.pull_request.head.sha }}
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
+          cache: 'gradle'
       - name: Run with Gradle
         run: ./gradlew clean test --info
-      - uses: kentaro-m/auto-assign-action@v1.1.2
+      - uses: kentaro-m/auto-assign-action@v1.2.5
         with:
           configuration-path: ".github/auto_assign.yml"

.github/workflows/release.yml

@@ -17,25 +17,27 @@ jobs:
       JRELEASER_TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_API_SECRET }}
       JRELEASER_TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
       JRELEASER_TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
+      JRELEASER_MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN}}
     services:
       mongodb:
         image: mongo:3.2
         ports:
           - 27017:27017
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '11'
+        cache: 'gradle'
     - name: Run tests
       run: ./gradlew clean test --info
     - name: Build artifacts
       run: ./gradlew -Penv=stable -Prelease=${{ github.event.inputs.version }} clean assemble
     - name: Release
-      run: ./gradlew -Penv=stable -Prelease=${{ github.event.inputs.version }} jreleaserRelease
+      run: ./gradlew -Penv=stable -Prelease=${{ github.event.inputs.version }} jreleaserFullRelease --exclude-announcer=twitter
     - name: Update MongoDB
       env:
         MONGO_URL: ${{ secrets.MONGO_URL }}

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=11.0.13-tem
+java=11.0.17-tem

CONTRIBUTING.md

@@ -2,17 +2,14 @@
 
 We greatly value the feedback and contributions of our users.
 
-We keep a distinction between Bugs/Issues, New Features and Support Requests. We also try to minimise the noise in our GitHub Issues stream and prefer having a conversation on [SDKMAN Slack](https://slack.sdkman.io) before creating new issues, if you are not fully sure how to categorize your request. Simply sign up and join one of the following channels:
+We distinguish between Bugs/Issues, New Features and Support Requests. We also try to minimise the noise in our GitHub Issues stream and prefer having a conversation on [SDKMAN Discord](https://discord.gg/y9mVJYVyu4) before creating new issues if you are not entirely sure how to categorize your request. Sign up and join our Help channel.
 
-- User Issues can be raised in our [User Issues channel](https://sdkman.slack.com/app_redirect?channel=user-issues).
-- New Features or Enhancements can be discussed in our [CLI Development channel](https://sdkman.slack.com/app_redirect?channel=cli-development).
+The [GitHub Issue Tracker](https://github.com/sdkman/sdkman-cli/issues/new) provides templates for required information.
 
-The [GitHub Issue Tracker](https://github.com/sdkman/sdkman-cli/issues/new) provides templates for required informations.
-
-**Unfortunately we might simply close any Github Issues that have not followed the requested template.**
+**Unfortunately, we might close any GitHub Issues that have not followed the requested template.**
 
 ### Pull Requests
 
-Pull Requests are _always_ very welcome, but require a valid GitHub Issue as decribed above. The PR template is to be filled in before submission, ensuring that it is _linked back_ to the Github Issue number by replacing `#XXX` with the appropriate issue reference.
+Pull Requests are _always_ very welcome but require a valid GitHub Issue as described above. The PR template is to be filled in before submission, ensuring that it is _linked back_ to the GitHub Issue number by replacing `#XXX` with the appropriate issue reference.
 
-Each PR should also be accompanied by a passing test(s) proving it's validity (where feasible). The feasibility of the test will emerge in the initial discussions of the issue.
+Each PR should also be accompanied by a passing test(s) proving its validity (where feasible). The feasibility of the test will emerge in the initial discussions of the issue.

README.md

@@ -1,14 +1,20 @@
 # SDKMAN! CLI
 ### The Software Development Kit Manager Command Line Interface
 
-[![Backers on Open Collective](https://opencollective.com/sdkman/backers/badge.svg)](#backers) 
-[![Sponsors on Open Collective](https://opencollective.com/sdkman/sponsors/badge.svg)](#sponsors)
-[![Slack](https://slack.sdkman.io/badge.svg)](https://slack.sdkman.io)
+[![Backers on Open Collective](https://img.shields.io/opencollective/backers/sdkman)](#backers) 
+[![Sponsors on Open Collective](https://img.shields.io/opencollective/sponsors/sdkman)](#sponsors)
+[![Discord](https://img.shields.io/discord/1245471991117512754)](https://discord.gg/y9mVJYVyu4)
 
-SDKMAN is a tool for managing parallel Versions of multiple Software Development Kits on any Unix based system. It provides a convenient command line interface for installing, switching, removing and listing Candidates.
+SDKMAN is a tool for managing parallel Versions of multiple Software Development Kits on any Unix-based system. It provides a convenient command-line interface for installing, switching, removing, and listing Candidates.
 
 See documentation on the [SDKMAN! website](https://sdkman.io).
 
+## NOTICE
+
+**We are rewriting all the commands for SDKMAN! in [Rust](https://www.rust-lang.org/) under a [new project](https://github.com/sdkman/sdkman-cli-native) that supplements this one. Only bug fixes to supporting code will be
+accepted in this project. As a result, no further enhancements will be accepted on the commands in this project, and the commands here will be phased out in due course. This project will eventually form a lightweight
+wrapper/launcher for the replacement Rust commands.**
+
 ## Installation
 
 Open your favourite terminal and enter the following:
@@ -23,32 +29,9 @@ All SDKMAN's BDD tests describing the CLI behaviour are written in Cucumber and
 
     $ ./gradlew test
 
-To perform development, you will need to have a JDK 8 or higher installed which can be obtained by running the following after installing SDKMAN:
-
-    $ sdk install java
-
-### Using Docker for tests
-
-You can run the tests in a Docker container to guarantee a clean test environment.
-
-    $ docker build --tag=sdkman-cli/gradle .
-    $ docker run --rm -it sdkman-cli/gradle test
-
-By running the following command, you don't need to wait for downloading Gradle wrapper and other dependencies. The test reports can be found under the local `build` directory.
-
-    $ docker run --rm -it -v $PWD:/usr/src/app -v $HOME/.gradle:/root/.gradle sdkman-cli/gradle test
-
-### Local Installation
-
-To install SDKMAN locally running against your local server, run the following commands:
-
-	$ ./gradlew install
-	$ source ~/.sdkman/bin/sdkman-init.sh
-
-Or run install locally with Production configuration:
+To perform development, you will need to have a JDK 11 installed which can be obtained by running the following after installing SDKMAN:
 
-	$ ./gradlew -Penv=production install
-	$ source ~/.sdkman/bin/sdkman-init.sh
+    $ sdk env install
 
 ## Contributors
 

bin/release-binary.sh

@@ -25,4 +25,9 @@ fi
 
 echo "Release: $FIELD as $VERSION"
 
-mongo "${MONGO_URL}" --username="${MONGO_USERNAME}" --password="${MONGO_PASSWORD}" -eval "db.application.updateOne({}, {\$set: { \"$FIELD\": \"$VERSION\"}});"
+docker run mongo:3.2 mongo "${MONGO_URL}" \
+	--username="${MONGO_USERNAME}" \
+	--password="${MONGO_PASSWORD}" \
+	--quiet \
+	--eval "db.application.updateOne({}, {\$set: { \"$FIELD\": \"$VERSION\"}});"
+

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id('groovy')
-	id('org.jreleaser').version('0.8.0').apply(false)
+	id('org.jreleaser').version('1.4.0').apply(false)
 }
 
 String userHome = System.getProperty('user.home')

contrib/completion/bash/sdk

@@ -23,7 +23,7 @@ __sdkman_complete_command() {
 
 	case $command in
 		sdk)
-			candidates=("install" "uninstall" "list" "use" "config" "default" "home" "env" "current" "upgrade" "version" "broadcast" "help" "offline" "selfupdate" "update" "flush")
+			candidates=("install" "uninstall" "list" "use" "config" "default" "home" "env" "current" "upgrade" "version" "help" "offline" "selfupdate" "update" "flush")
 			;;
 		current|c|default|d|home|h|uninstall|rm|upgrade|ug|use|u)
 			local -r candidate_paths=("${SDKMAN_CANDIDATES_DIR}"/*)
@@ -45,7 +45,7 @@ __sdkman_complete_command() {
 			candidates=("force")
 			;;
 		flush)
-			candidates=("archives" "temp" "broadcast" "version")
+			candidates=("temp" "version")
 			;;
 	esac
 

gradle/archive.gradle

@@ -10,7 +10,6 @@ task prepareBin(type: Copy) {
 	filter(
 			ReplaceTokens,
 			tokens: [
-					SDKMAN_VERSION       : sdkmanVersion,
 					SDKMAN_CANDIDATES_API: candidatesApi
 			]
 	)

gradle/release.gradle

@@ -34,14 +34,20 @@ jreleaser {
 			distributionType = 'BINARY'
 			artifact {
 				path = "build/distributions/{{distributionName}}-${sdkmanVersion}.zip"
+				extraProperties.put("universal", "true")
 			}
 		}
 	}
-
+	
 	announce {
 		twitter {
 			active = 'RELEASE'
 			status = 'Released version {{tagName}} of SDKMAN! {{releaseNotesUrl}}'
 		}
+		mastodon {
+			active = 'RELEASE'
+			status = 'Released version {{tagName}} of SDKMAN! {{releaseNotesUrl}}'
+			host = 'https://fosstodon.org'
+		}
 	}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/bash/sdkman-availability.sh

@@ -16,26 +16,25 @@
 #   limitations under the License.
 #
 
-function __sdkman_update_broadcast_and_service_availability() {
-	local broadcast_live_id=$(__sdkman_determine_broadcast_id)
-	__sdkman_set_availability "$broadcast_live_id"
-	__sdkman_update_broadcast "$broadcast_live_id"
+function __sdkman_update_service_availability() {
+	local healthcheck_status=$(__sdkman_determine_healthcheck_status)
+	__sdkman_set_availability "$healthcheck_status"
 }
 
-function __sdkman_determine_broadcast_id() {
+function __sdkman_determine_healthcheck_status() {
 	if [[ "$SDKMAN_OFFLINE_MODE" == "true" || "$COMMAND" == "offline" && "$QUALIFIER" == "enable" ]]; then
 		echo ""
 	else
-		echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CANDIDATES_API}/broadcast/latest/id")
+		echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CANDIDATES_API}/healthcheck")
 	fi
 }
 
 function __sdkman_set_availability() {
-	local broadcast_id="$1"
-	local detect_html="$(echo "$broadcast_id" | tr '[:upper:]' '[:lower:]' | grep 'html')"
-	if [[ -z "$broadcast_id" ]]; then
+	local healthcheck_status="$1"
+	local detect_html="$(echo "$healthcheck_status" | tr '[:upper:]' '[:lower:]' | grep 'html')"
+	if [[ -z "$healthcheck_status" ]]; then
 		SDKMAN_AVAILABLE="false"
-		__sdkman_display_offline_warning "$broadcast_id"
+		__sdkman_display_offline_warning "$healthcheck_status"
 	elif [[ -n "$detect_html" ]]; then
 		SDKMAN_AVAILABLE="false"
 		__sdkman_display_proxy_warning
@@ -45,8 +44,8 @@ function __sdkman_set_availability() {
 }
 
 function __sdkman_display_offline_warning() {
-	local broadcast_id="$1"
-	if [[ -z "$broadcast_id" && "$COMMAND" != "offline" && "$SDKMAN_OFFLINE_MODE" != "true" ]]; then
+	local healthcheck_status="$1"
+	if [[ -z "$healthcheck_status" && "$COMMAND" != "offline" && "$SDKMAN_OFFLINE_MODE" != "true" ]]; then
 		__sdkman_echo_red "==== INTERNET NOT REACHABLE! ==================================================="
 		__sdkman_echo_red ""
 		__sdkman_echo_red " Some functionality is disabled or only partially available."
@@ -65,32 +64,3 @@ function __sdkman_display_proxy_warning() {
 	__sdkman_echo_red "================================================================================"
 	echo ""
 }
-
-function __sdkman_update_broadcast() {
-	local broadcast_live_id broadcast_id_file broadcast_text_file broadcast_old_id
-
-	broadcast_live_id="$1"
-	broadcast_id_file="${SDKMAN_DIR}/var/broadcast_id"
-	broadcast_text_file="${SDKMAN_DIR}/var/broadcast"
-	broadcast_old_id=""
-
-	if [[ -f "$broadcast_id_file" ]]; then
-		broadcast_old_id=$(< "$broadcast_id_file")
-	fi
-
-	if [[ -f "$broadcast_text_file" ]]; then
-		BROADCAST_OLD_TEXT=$(< "$broadcast_text_file")
-	fi
-
-	if [[ "$SDKMAN_AVAILABLE" == "true" && "$broadcast_live_id" != "$broadcast_old_id" && "$COMMAND" != "selfupdate" && "$COMMAND" != "flush" ]]; then
-		mkdir -p "${SDKMAN_DIR}/var"
-
-		echo "$broadcast_live_id" | tee "$broadcast_id_file" > /dev/null
-
-		BROADCAST_LIVE_TEXT=$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/broadcast/latest")
-		echo "$BROADCAST_LIVE_TEXT" | tee "$broadcast_text_file" > /dev/null
-		if [[ "$COMMAND" != "broadcast" ]]; then
-			__sdkman_echo_cyan "$BROADCAST_LIVE_TEXT"
-		fi
-	fi
-}