From f1ef7796b5bc48d9882c184cf6d35776ad027b49 Mon Sep 17 00:00:00 2001
From: Karol Bucek <self@kares.org>
Date: Thu, 14 Jan 2021 15:59:58 +0100
Subject: [PATCH] Build: run task to update RGs to 3.2

---
 build.gradle | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index bb352082902..804b33c8f55 100644
--- a/build.gradle
+++ b/build.gradle
@@ -205,14 +205,26 @@ tasks.register("installBundler") {
     outputs.files file("${projectDir}/vendor/bundle/jruby/2.5.0/bin/bundle")
     doLast {
       gem(projectDir, buildDir, "bundler", "~> 2", "${projectDir}/vendor/bundle/jruby/2.5.0")
-  }
+    }
+}
+
+tasks.register("updateRubygems", Exec) {
+    dependsOn assemblyDeps
+
+    // RGs 3.2 also packages Bundler -> will end up being a (stdlib) builtin library
+    outputs.files file("${projectDir}/vendor/jruby/bin/bundle")
+
+    workingDir "${projectDir}/vendor/jruby"
+    commandLine 'bin/jruby', '-S', 'gem', 'update', '--system', '3.2.5'
+
+    // NOTE: after the upgrade we could uninstall the rubygems-update gem
 }
 
 tasks.register("bootstrap"){
-    dependsOn installBundler
+    dependsOn updateRubygems
     doLast {
       setupJruby(projectDir, buildDir)
-  }
+    }
 }