From abf7b45714b900e9d3c89d13bfe9acaf4857f4b8 Mon Sep 17 00:00:00 2001
From: Renato Athaydes <renato@athaydes.com>
Date: Sun, 28 Apr 2024 16:34:56 +0200
Subject: [PATCH] Preparations for 2.0 release.

Skip 1.0 release because Jar had already been published with version 1.1.x.
---
 .github/workflows/release.yml |  4 ++--
 CHANGELOG.MD                  |  2 +-
 build.gradle                  |  2 +-
 jgrab-client/Cargo.lock       |  2 +-
 jgrab-client/Cargo.toml       |  2 +-
 releases/install.sh           | 18 ++++++------------
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68b0723..ae110bb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,9 +34,9 @@ jobs:
           - target: x86_64-apple-darwin
             os: macos-latest
             build-tool: cargo-zigbuild
-          - target: x86_64-pc-windows-gnu
+          - target: x86_64-pc-windows-msvc
             os: windows-latest
-            build-tool: cargo-zigbuild
+            build-tool: cargo
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index aa2bcc7..8074b61 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.0] - 2024-04-28
+## [2.0.0] - 2024-04-28
 
 ### Changed
 
diff --git a/build.gradle b/build.gradle
index f4ac851..ea11fac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import java.util.regex.Pattern
 
 allprojects {
     group = 'com.athaydes.jgrab'
-    version = '1.1.1'
+    version = '2.0.0'
 }
 
 tasks.register( 'localRelease' ) {
diff --git a/jgrab-client/Cargo.lock b/jgrab-client/Cargo.lock
index e7daef6..4511e7d 100644
--- a/jgrab-client/Cargo.lock
+++ b/jgrab-client/Cargo.lock
@@ -48,7 +48,7 @@ dependencies = [
 
 [[package]]
 name = "jgrab-client"
-version = "1.0.0"
+version = "2.0.0"
 dependencies = [
  "dirs",
  "wait-timeout",
diff --git a/jgrab-client/Cargo.toml b/jgrab-client/Cargo.toml
index f6a3ca9..8aad34f 100644
--- a/jgrab-client/Cargo.toml
+++ b/jgrab-client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "jgrab-client"
-version = "1.0.0"
+version = "2.0.0"
 authors = [ "Renato Athaydes" ]
 
 [dependencies]
diff --git a/releases/install.sh b/releases/install.sh
index 14a3783..8a8b562 100755
--- a/releases/install.sh
+++ b/releases/install.sh
@@ -4,13 +4,13 @@
 # project's installer: https://rustup.rs/
 
 # This is just a little script that can be curled from the internet to
-# install JGrab. It just does platform detection, curls the JGrab client
-# executable and the Java daemon's jar.
+# install JGrab. It just does platform detection and curls the JGrab client
+# executable.
 
 set -u
 
 JGRAB_BASE_URL="https://github.com/renatoathaydes/jgrab/releases/download"
-JGRAB_JAR_URL="https://repo1.maven.org/maven2/com/athaydes/jgrab/jgrab-runner/1.1.1/jgrab-runner-1.1.1-fat-jar.jar"
+JGRAB_CLIENT_TAG="v2.0.0"
 
 usage() {
     cat 1>&2 <<EOF
@@ -56,12 +56,10 @@ main() {
             ;;
     esac
 
-    local _version="v0.6.0"
-    local _url="$JGRAB_BASE_URL/$_version/jgrab-client-$_version-$_arch$_zip_ext"
+    local _url="$JGRAB_BASE_URL/$JGRAB_CLIENT_TAG/jgrab-client-$JGRAB_CLIENT_TAG-$_arch$_zip_ext"
     
     local _dir="$(mktemp -d 2>/dev/null || ensure mktemp -d -t jgrab)"
     local _client_file="$_dir/jgrab-client$_zip_ext"
-    local _jar_file="$_dir/jgrab.jar"
 
     local _ansi_escapes_are_valid=false
     if [ -t 2 ]; then
@@ -106,8 +104,6 @@ main() {
         printf '%s\n' 'info: downloading JGrab Java Daemon' 1>&2
     fi
 
-    ensure curl -sSfL "$JGRAB_JAR_URL" -o "$_jar_file"
-
     local _jgrab_home="$HOME/.jgrab"
 
     ignore mkdir "$_jgrab_home"
@@ -121,8 +117,6 @@ main() {
             ;;
     esac
 
-    mv "$_jar_file" "$_jgrab_home"
-
     say "Installed JGrab at $_jgrab_home"
     say "Use the jgrab-client to run the native Rust client, or the jar to run JGrab only using Java:"
     ls "$_jgrab_home"
@@ -217,7 +211,7 @@ get_architecture() {
             ;;
 
         MINGW* | MSYS* | CYGWIN*)
-            local _ostype=pc-windows-gnu
+            local _ostype=pc-windows-msvc
             ;;
 
         *)
@@ -257,7 +251,7 @@ get_architecture() {
             fi
             ;;
 
-        aarch64)
+        aarch64 | arm64)
             local _cputype=aarch64
             ;;