From 5dda891716ab1b462e6df6fcaeb45b6811f736b7 Mon Sep 17 00:00:00 2001
From: STAM <stam@epicm.org>
Date: Sat, 1 Jul 2023 16:07:10 +0300
Subject: [PATCH] prepatch

---
 linux/ecosystem/gitlab/runner/android-sdk/Dockerfile      | 8 ++++----
 .../ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile | 4 ++--
 .../ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/linux/ecosystem/gitlab/runner/android-sdk/Dockerfile b/linux/ecosystem/gitlab/runner/android-sdk/Dockerfile
index 3b74b9e9a..9e34bf32a 100644
--- a/linux/ecosystem/gitlab/runner/android-sdk/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/android-sdk/Dockerfile
@@ -5,21 +5,21 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk
 ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk
 
-ENV GRADLE_VERSION=7.4.2
+ENV GRADLE_VERSION=8.2
 ENV GRADLE_LINK=https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip
 ENV GRADLE_ROOT=/opt/gradle
 ENV GRADLE_PATH=${GRADLE_ROOT}/gradle-${GRADLE_VERSION}
 ENV GRADLE_BIN=$GRADLE_PATH/bin
 ARG GRADLE_TEMP=/tmp/gradle.zip
 
-ENV KTC_VERSION=1.6.21
+ENV KTC_VERSION=1.8.22
 ENV KTC_LINK=https://github.com/JetBrains/kotlin/releases/download/v${KTC_VERSION}/kotlin-compiler-${KTC_VERSION}.zip
 ARG KTC_TEMP=/tmp/kotlinc.tgz
 ENV KTC_ROOT=/opt/kotlin
 ENV KTC_PATH=${KTC_ROOT}/kotlinc
 ENV KTC_BIN=$KTC_PATH/bin
 
-ENV PATH=PATH=$PATH:$GRADLE_BIN:${KTC_BIN}
+ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
 
 ##################################################################
 #                   Android SDK
@@ -51,7 +51,7 @@ RUN mkdir -p ${KTC_PATH}
 RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP}
 RUN 7zz x $KTC_TEMP -o$KTC_ROOT
 RUN chmod +x -R ${KTC_BIN}
-RUN kotlinc -version
+RUN kotlin -version
 
 ##################################################################
 #                   cleaninig up
diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
index d4af9650e..6cc91c211 100644
--- a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
@@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
 ENV KTC_PATH=${KTC_ROOT}/kotlinc
 ENV KTC_BIN=$KTC_PATH/bin
 
-ENV PATH=PATH=$PATH:$GRADLE_BIN:${KTC_BIN}
+ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
 
 ##################################################################
 #                   Android SDK
@@ -51,7 +51,7 @@ RUN mkdir -p ${KTC_PATH}
 RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP}
 RUN 7zz x $KTC_TEMP -o$KTC_ROOT
 RUN chmod +x -R ${KTC_BIN}
-RUN kotlinc -version
+RUN kotlin -version
 
 ##################################################################
 #                   cleaninig up
diff --git a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
index d4af9650e..6cc91c211 100644
--- a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
@@ -19,7 +19,7 @@ ENV KTC_ROOT=/opt/kotlin
 ENV KTC_PATH=${KTC_ROOT}/kotlinc
 ENV KTC_BIN=$KTC_PATH/bin
 
-ENV PATH=PATH=$PATH:$GRADLE_BIN:${KTC_BIN}
+ENV PATH=$PATH:${GRADLE_BIN}:${KTC_BIN}
 
 ##################################################################
 #                   Android SDK
@@ -51,7 +51,7 @@ RUN mkdir -p ${KTC_PATH}
 RUN wget --no-check-certificate -nv --random-wait --retry-connrefused --continue ${KTC_LINK} -O ${KTC_TEMP}
 RUN 7zz x $KTC_TEMP -o$KTC_ROOT
 RUN chmod +x -R ${KTC_BIN}
-RUN kotlinc -version
+RUN kotlin -version
 
 ##################################################################
 #                   cleaninig up