From 8936433892fc5f50fedd7305ccea3f949c8a1c6a Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sebastian.schuberth@bosch.io>
Date: Thu, 14 Oct 2021 19:35:47 +0200
Subject: [PATCH] Remove Bundler as a runtime prerequisite

This is not required anymore, actually already as of d282618. Ruby is
still required for CocoaPods.

Signed-off-by: Sebastian Schuberth <sebastian.schuberth@bosch.io>
---
 .azure-pipelines.yml                     | 1 -
 .azure-pipelines/LinuxAnalyzerTest.yml   | 3 ---
 .azure-pipelines/WindowsAnalyzerTest.yml | 3 ---
 Dockerfile                               | 2 --
 4 files changed, 9 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 03c82cf6c1b18..d77bfb094a56c 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -16,7 +16,6 @@ variables:
   ORT_DATA_DIR: $(Pipeline.Workspace)/.ort
   # Tool versions.
   BOWER_VERSION: 1.8.8
-  BUNDLER_VERSION: 2.1.4
   COMPOSER_VERSION: 5.1.0 # The version refers to the installer, not to Composer.
   CONAN_VERSION: 1.40.3
   GO_DEP_VERSION: 0.5.4
diff --git a/.azure-pipelines/LinuxAnalyzerTest.yml b/.azure-pipelines/LinuxAnalyzerTest.yml
index 08f6ed26b6c2c..fae2bc3f1ccfb 100644
--- a/.azure-pipelines/LinuxAnalyzerTest.yml
+++ b/.azure-pipelines/LinuxAnalyzerTest.yml
@@ -28,9 +28,6 @@ jobs:
         virtualenv==$VIRTUALENV_VERSION
       conan user # Create the conan data directory. Automatic detection of your arch, compiler, etc.
 
-      # Install Ruby packages.
-      sudo gem install bundler -v $BUNDLER_VERSION
-
       # Downgrade Rust, because the CargoSubcrateTest fails with the pre-installed version.
       rustup default $RUST_VERSION
 
diff --git a/.azure-pipelines/WindowsAnalyzerTest.yml b/.azure-pipelines/WindowsAnalyzerTest.yml
index 60a9ce30200c6..506803d1ef429 100644
--- a/.azure-pipelines/WindowsAnalyzerTest.yml
+++ b/.azure-pipelines/WindowsAnalyzerTest.yml
@@ -30,9 +30,6 @@ jobs:
       pip install --user conan==$env:CONAN_VERSION pipenv==$env:PYTHON_PIPENV_VERSION virtualenv==$env:VIRTUALENV_VERSION
       conan user # Create the conan data directory. Automatic detection of your arch, compiler, etc.
 
-      # Install Ruby packages.
-      gem install bundler -v $env:BUNDLER_VERSION
-
       # Stop adb because it otherwise locks the working directory which fails the checkout step.
       Stop-Process -Name "adb"
 
diff --git a/Dockerfile b/Dockerfile
index adfe775b851f5..823dfad6328c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,7 +49,6 @@ FROM adoptopenjdk:11-jre-hotspot-bionic
 ENV \
     # Package manager versions.
     BOWER_VERSION=1.8.8 \
-    BUNDLER_VERSION=1.16.1-1 \
     CARGO_VERSION=0.52.0-0ubuntu1~18.04.1 \
     COMPOSER_VERSION=1.6.3-1 \
     CONAN_VERSION=1.40.3 \
@@ -102,7 +101,6 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/
         mercurial \
         subversion \
         # Install package managers (in versions known to work).
-        bundler=$BUNDLER_VERSION \
         cargo=$CARGO_VERSION \
         composer=$COMPOSER_VERSION \
         nodejs \