HSPC-177: updated gradle version to 8.5 and java to 21 (#138)

* updated gradle version to 8.5 and java to 21

* Update build.gradle

* updated prefix for image tag epicbox-hyperskill/java and epicbox-hyperskill/gradle

* replaced develop branch to main

* hs-test index set to version 12.0.1

* updated version for hs-test

* changed the base image and used poetry for installation dependencies

* added login to hoperskill.azurecr.yo before image build

* Revert "added login to hoperskill.azurecr.yo before image build"

This reverts commit dcf02af.

* reverted java version to 17, updated other images

Author: polischuks

.github/workflows/ci.yml

@@ -114,7 +114,7 @@ jobs:
         uses: ./.github/workflows/actions/build
         with:
           path: epicbox-hyperskill/gradle
-          image_name_tag: hyperskill-gradle:7.3-jdk11
+          image_name_tag: hyperskill-gradle:8.5-jdk17
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
   build_hyperskill_gradle_spring_image:
@@ -127,7 +127,7 @@ jobs:
         uses: ./.github/workflows/actions/build
         with:
           path: epicbox-hyperskill/gradle-spring
-          image_name_tag: hyperskill-gradle-spring:7.3-jdk17
+          image_name_tag: hyperskill-gradle-spring:8.5-jdk17
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
   build_hyperskill_java_image:

epicbox-hyperskill/gradle-spring/Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:7.3-jdk17
+FROM gradle:8.5-jdk17
 
 COPY --chown=gradle checker/ /checker/
 

epicbox-hyperskill/gradle-spring/checker/sandbox/build.gradle

@@ -7,11 +7,12 @@ subprojects {
 
     repositories {
         mavenCentral()
+        maven { url "https://packages.jetbrains.team/maven/p/hyperskill-hs-test/maven" }
         maven { url "https://jitpack.io" }
     }
 
     dependencies {
-        testImplementation 'com.github.hyperskill:hs-test:v10.0.3'
+        testImplementation 'com.github.hyperskill:hs-test:12.0.2'
     }
 
     sourceSets {
@@ -43,7 +44,7 @@ subprojects {
 
 project(':util') {
     dependencies {
-        implementation 'com.github.hyperskill:hs-test:v10.0.3'
+        implementation 'com.github.hyperskill:hs-test:12.0.2'
     }
 }
 

epicbox-hyperskill/gradle-spring/checker/sandbox/files/build.gradle

@@ -2,8 +2,8 @@ buildscript {
     apply plugin: 'hyperskill'
 
     def javaVersion = Integer.parseInt(JavaVersion.current().getMajorVersion())
-    def bootVersion = (javaVersion == 17) ? hs.spring.bootVersion : "2.3.1.RELEASE"
-    def depsVersion = (javaVersion == 17) ? hs.spring.dependencyManagementVersion : "1.0.9.RELEASE"
+    def bootVersion = (javaVersion == 17) ? hs.spring.bootVersion : "3.2.0"
+    def depsVersion = (javaVersion == 17) ? hs.spring.dependencyManagementVersion : "1.1.3"
 
     repositories {
         mavenCentral()

epicbox-hyperskill/gradle-spring/checker/sandbox/settings.gradle

@@ -1,10 +1,11 @@
 buildscript {
     repositories {
+        maven { url "https://packages.jetbrains.team/maven/p/hyperskill-hs-test/maven" }
         maven { url 'https://jitpack.io' }
     }
 
     dependencies {
-        classpath 'com.github.hyperskill:hs-gradle-plugin:v1.1'
+        classpath 'com.github.hyperskill:hs-gradle-plugin:1.6'
     }
 }
 

epicbox-hyperskill/gradle/Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:7.3-jdk11
+FROM gradle:8.5.0-jdk17
 
 COPY --chown=gradle checker/ /checker/
 

epicbox-hyperskill/gradle/checker/template/build.gradle

@@ -1,20 +1,21 @@
 plugins {
     id 'application'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.30'
+    id 'org.jetbrains.kotlin.jvm' version '2.0.0'
     id 'scala'
 }
 
-sourceCompatibility = 11
+sourceCompatibility = 17
 
 repositories {
     mavenCentral()
+    maven { url "https://packages.jetbrains.team/maven/p/hyperskill-hs-test/maven" }
     maven { url "https://jitpack.io" }
 }
 
 dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
-    implementation 'org.scala-lang:scala-library:2.13.6'
-    testImplementation 'com.github.hyperskill:hs-test:v10.0.3'
+    implementation 'org.scala-lang:scala-library:2.13.12'
+    testImplementation 'com.github.hyperskill:hs-test:12.0.2'
 }
 
 sourceSets {

epicbox-hyperskill/java/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-slim
+FROM openjdk:17-jdk-slim
 
 RUN apt-get update && \
     apt-get install --yes python3 unzip curl && \
@@ -11,7 +11,7 @@ RUN mkdir /checker && \
     rm /checker/kotlin.zip
 
 RUN curl -L -o /checker/hs-test.jar \
-    https://github.com/hyperskill/hs-test/releases/download/v10.0.3/hs-test-10.0.3.jar
+    https://github.com/hyperskill/hs-test/releases/download/v12.0.2/hs-test-12.0.2.jar
 
 ENV PATH="/checker/kotlinc/bin:$PATH"
 

epicbox-hyperstyle/Dockerfile

@@ -1,4 +1,4 @@
-FROM stepik/hyperstyle-base:py3.8.11-java11.0.11-node14.17.3-go1.18.5
+FROM hyperskill.azurecr.io/hyperstyle-base:py3.10.14-java11.0.11-node14.17.3-go1.18.5
 
 ENV ESLINT_VERSION          7.5.0
 
@@ -18,7 +18,7 @@ ENV GOLANG_LINT_DIRECTORY   ${LINTERS_DIRECTORY}/golangci-lint
 
 RUN apt-get update && apt-get install -y build-essential libssl-dev libffi-dev python3-dev git
 
-RUN git clone --branch develop https://github.com/hyperskill/hyperstyle.git /review
+RUN git clone --branch main https://github.com/hyperskill/hyperstyle.git /review
 
 RUN mkdir -p ${CHECKSTYLE_DIRECTORY} && \
     mkdir -p ${DETEKT_DIRECTORY} && \
@@ -60,10 +60,16 @@ RUN go mod download && \
     rm main.go &&  \
     chmod ugo-w go.mod go.sum
 
-RUN pip install -r ./review/requirements-build.txt --verbose
-RUN pip install -r ./review/requirements.txt --verbose
-RUN pip install -r ./review/requirements-test.txt --verbose
+ARG POETRY_VERSION=1.8.3
+RUN pip install poetry==${POETRY_VERSION} \
+  && poetry config virtualenvs.create false \
+  && python -m venv /hyperstyle
 
-RUN pip install ./review --use-feature=in-tree-build
+WORKDIR /review
+
+RUN . /hyperstyle/bin/activate \
+  && poetry install --no-interaction --no-ansi --no-cache --no-root
+
+WORKDIR /
 
 CMD ["/bin/bash"]