From 427f7b89fd9d79f45fcdac1553648a6c9b7d3397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Sat, 30 Oct 2021 20:22:49 +0200 Subject: [PATCH] Add gitlab ci file. --- .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++ build.gradle.kts | 18 +++++++++++------- gradle.properties | 4 ++++ settings.gradle.kts | 7 +++++-- 4 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..a580de8 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,28 @@ +image: gradle:jdk11 + +before_script: + - export GRADLE_USER_HOME=`pwd`/.gradle + +build: + stage: build + script: + - gradle --build-cache assemble + - gradle --build-cache test + cache: + key: "$CI_COMMIT_REF_NAME" + policy: push + paths: + - build + - .gradle + +artifact: + stage: deploy + script: gradle publish + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + cache: + key: "$CI_COMMIT_REF_NAME" + policy: pull-push + paths: + - build + - .gradle diff --git a/build.gradle.kts b/build.gradle.kts index bc8a128..b8224ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,10 +2,14 @@ import org.jetbrains.compose.compose import org.jetbrains.compose.desktop.application.dsl.TargetFormat import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +val kotlinxSerializationVersion: String by project +val cliktVersion: String by project +val kotlinVersion: String by project + plugins { - kotlin("jvm") version "1.5.21" - kotlin("plugin.serialization") version "1.5.21" - id("org.jetbrains.compose") version "1.0.0-alpha3" + kotlin("jvm") + kotlin("plugin.serialization") + id("org.jetbrains.compose") } group = "de.pheerai" @@ -19,10 +23,10 @@ repositories { dependencies { implementation(compose.desktop.currentOs) - implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", "1.2.2") - implementation("com.github.ajalt.clikt", "clikt-jvm", "3.2.0") - implementation("com.github.ajalt.clikt", "clikt", "3.2.0") - testImplementation(kotlin("test", "1.5.21")) + implementation("org.jetbrains.kotlinx", "kotlinx-serialization-json", kotlinxSerializationVersion) + implementation("com.github.ajalt.clikt", "clikt-jvm", cliktVersion) + implementation("com.github.ajalt.clikt", "clikt", cliktVersion) + testImplementation("org.jetbrains.kotlin", "kotlin-test", kotlinVersion) } tasks.test { diff --git a/gradle.properties b/gradle.properties index 7fc6f1f..8f143ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,5 @@ kotlin.code.style=official + +kotlinxSerializationVersion=1.2.2 +cliktVersion=1.2.2 +kotlinVersion=1.5.31 diff --git a/settings.gradle.kts b/settings.gradle.kts index 48d39ec..23b4698 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,7 +3,10 @@ pluginManagement { gradlePluginPortal() maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } - + plugins { + kotlin("jvm") version "1.5.21" + kotlin("plugin.serialization") version "1.5.21" + id("org.jetbrains.compose") version "1.0.0-alpha3" + } } rootProject.name = "quiztable" -