diff --git a/versions.properties b/versions.properties index fb28adb..27ad306 100644 --- a/versions.properties +++ b/versions.properties @@ -6,13 +6,6 @@ #### #### suppress inspection "SpellCheckingInspection" for whole file #### suppress inspection "UnusedProperty" for whole file - -plugin.com.palantir.git-version=0.15.0 - -plugin.org.jetbrains.dokka=1.7.20 - -plugin.org.jetbrains.kotlinx.kover=0.6.0 - version.arrow=1.1.3 version.ch.qos.logback..logback-classic=1.2.11 -- 2.51.2 From ade9fbaf26b307958252e1c20a6c3acab3cea89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:07:34 +0100 Subject: [PATCH 02/11] upgrade: Logback Classic 1.4.5 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 27ad306..412c87c 100644 --- a/versions.properties +++ b/versions.properties @@ -8,7 +8,7 @@ #### suppress inspection "UnusedProperty" for whole file version.arrow=1.1.3 -version.ch.qos.logback..logback-classic=1.2.11 +version.ch.qos.logback..logback-classic=1.4.5 version.kotlin=1.7.20 -- 2.51.2 From e17938e40f2c16e10d5cdbec86eff0e6e735a6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:11:04 +0100 Subject: [PATCH 03/11] upgrade: Slf4j 2.0.6 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 412c87c..e4c8828 100644 --- a/versions.properties +++ b/versions.properties @@ -20,4 +20,4 @@ version.kotlinx.serialization=1.4.0 version.ktor=2.1.1 -version.org.slf4j..slf4j-api=1.7.36 +version.org.slf4j..slf4j-api=2.0.6 -- 2.51.2 From 53490d874511a257bbde86904d6ce9165554a236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:20:07 +0100 Subject: [PATCH 04/11] upgrade: Dokka 1.8.10 --- gradle/plugins/versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/plugins/versions.properties b/gradle/plugins/versions.properties index c0de161..fb4b7ca 100644 --- a/gradle/plugins/versions.properties +++ b/gradle/plugins/versions.properties @@ -7,7 +7,7 @@ #### suppress inspection "SpellCheckingInspection" for whole file #### suppress inspection "UnusedProperty" for whole file -version.org.jetbrains.dokka..dokka-gradle-plugin=1.7.20 +version.org.jetbrains.dokka..dokka-gradle-plugin=1.8.10 version.kotlin=1.7.20 -- 2.51.2 From 874ae72a312a557d96200061bd186aa083b9b944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:21:37 +0100 Subject: [PATCH 05/11] upgrade: Palantir Git Version 2.0.0 --- gradle/plugins/versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/plugins/versions.properties b/gradle/plugins/versions.properties index fb4b7ca..517d5f8 100644 --- a/gradle/plugins/versions.properties +++ b/gradle/plugins/versions.properties @@ -11,7 +11,7 @@ version.org.jetbrains.dokka..dokka-gradle-plugin=1.8.10 version.kotlin=1.7.20 -version.com.palantir.gradle.gitversion..gradle-git-version=0.15.0 +version.com.palantir.gradle.gitversion..gradle-git-version=2.0.0 plugin.org.gradle.kotlin.kotlin-dsl=2.3.3 -- 2.51.2 From 901acc3ed00f8fb2bf665796e08162eae107050d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:22:32 +0100 Subject: [PATCH 06/11] build(gradle): Removed the explicit Kotlin DSL dependency declaration --- gradle/plugins/versions.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle/plugins/versions.properties b/gradle/plugins/versions.properties index 517d5f8..88b7bf5 100644 --- a/gradle/plugins/versions.properties +++ b/gradle/plugins/versions.properties @@ -13,6 +13,4 @@ version.kotlin=1.7.20 version.com.palantir.gradle.gitversion..gradle-git-version=2.0.0 -plugin.org.gradle.kotlin.kotlin-dsl=2.3.3 - version.org.jetbrains.kotlinx..kover=0.6.1 -- 2.51.2 From 768beb05a7b77de11e7d35fb03c61f24c5d8d7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:24:42 +0100 Subject: [PATCH 07/11] upgrade: Kotlin 1.8.10 --- gradle/plugins/versions.properties | 2 +- versions.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/plugins/versions.properties b/gradle/plugins/versions.properties index 88b7bf5..a016d8d 100644 --- a/gradle/plugins/versions.properties +++ b/gradle/plugins/versions.properties @@ -9,7 +9,7 @@ version.org.jetbrains.dokka..dokka-gradle-plugin=1.8.10 -version.kotlin=1.7.20 +version.kotlin=1.8.10 version.com.palantir.gradle.gitversion..gradle-git-version=2.0.0 diff --git a/versions.properties b/versions.properties index e4c8828..abc6c3a 100644 --- a/versions.properties +++ b/versions.properties @@ -10,7 +10,7 @@ version.arrow=1.1.3 version.ch.qos.logback..logback-classic=1.4.5 -version.kotlin=1.7.20 +version.kotlin=1.8.10 version.kotlinx.coroutines=1.6.4 -- 2.51.2 From 076f0b2975748aad84f8ca6139aafa0bf2ee9fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:26:30 +0100 Subject: [PATCH 08/11] upgrade(spine): KotlinX.Serialization 1.5.0 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index abc6c3a..1b2462f 100644 --- a/versions.properties +++ b/versions.properties @@ -16,7 +16,7 @@ version.kotlinx.coroutines=1.6.4 version.kotlinx.datetime=0.4.0 -version.kotlinx.serialization=1.4.0 +version.kotlinx.serialization=1.5.0 version.ktor=2.1.1 -- 2.51.2 From 14bfcf4e0cc02bfd3dffd2652e1fcc91326b2e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:26:51 +0100 Subject: [PATCH 09/11] upgrade(spine): Ktor 2.2.4 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 1b2462f..642d064 100644 --- a/versions.properties +++ b/versions.properties @@ -18,6 +18,6 @@ version.kotlinx.datetime=0.4.0 version.kotlinx.serialization=1.5.0 -version.ktor=2.1.1 +version.ktor=2.2.4 version.org.slf4j..slf4j-api=2.0.6 -- 2.51.2 From 4ce3aa30b41f5329317d12eac7a56037067c9c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Mar 2023 18:27:37 +0100 Subject: [PATCH 10/11] upgrade: Arrow 1.1.5 --- versions.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 642d064..e7df190 100644 --- a/versions.properties +++ b/versions.properties @@ -6,7 +6,8 @@ #### #### suppress inspection "SpellCheckingInspection" for whole file #### suppress inspection "UnusedProperty" for whole file -version.arrow=1.1.3 + +version.arrow=1.1.5 version.ch.qos.logback..logback-classic=1.4.5 -- 2.51.2 From a83eb2f8a2b0694a367bf5642909554e65d22252 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sat, 18 Mar 2023 15:57:24 +0100 Subject: [PATCH 11/11] ci(gitlab): Extracted the JVM configuration --- .gitlab-ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 010aa8c..b748e0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,12 +21,17 @@ workflow: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_TAG -publish: +.jvm: image: archlinux:base + before_script: + - pacman -Syu --noconfirm git jre-openjdk-headless + variables: + JAVA_HOME: /usr/lib/jvm/default + +publish: + extends: [ .jvm ] stage: publish script: - - pacman -Syu --noconfirm git jre-openjdk-headless - - export JAVA_HOME=$(dirname $(dirname $(readlink -f $(command -v java)))) - > ./gradlew logger:publishAllPublicationsToGitLabRepository @@ -43,7 +48,7 @@ publish: interruptible: false .test-jvm: - image: openjdk:latest + extends: [ .jvm ] variables: module_path: $module script: @@ -161,7 +166,7 @@ spine-ktor:convert-coverage: module_path: spine-ktor/spine-ktor-server dokka: - image: openjdk:latest + extends: [ .jvm ] needs: [ ] script: - ./gradlew dokkaHtmlMultiModule