From 42adb0ce9b8edd9b34ac4e654fcfa33c8be38777 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Thu, 6 May 2021 21:36:25 -0400 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20vers=20Kotlin=201.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 48 +++++++++++-------- .../model/touchupkit/TouchUpKit.kt | 12 +++++ 2 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 src/main/kotlin/dev/fyloz/colorrecipesexplorer/model/touchupkit/TouchUpKit.kt diff --git a/build.gradle.kts b/build.gradle.kts index 5432c74..7538018 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,13 +2,20 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "dev.fyloz.colorrecipesexplorer" +val kotlinVersion = "1.5.0" +val springBootVersion = "2.3.4.RELEASE" + plugins { + // Outer scope variables can't be accessed in the plugins section, so we have to redefine them here + val kotlinVersion = "1.5.0" + val springBootVersion = "2.3.4.RELEASE" + id("java") - id("org.jetbrains.kotlin.jvm") version "1.4.30" - id("org.jetbrains.dokka") version "1.4.20" - id("org.springframework.boot") version "2.3.4.RELEASE" - id("org.jetbrains.kotlin.plugin.spring") version "1.4.30" - id("org.jetbrains.kotlin.plugin.jpa") version "1.4.30" + id("org.jetbrains.kotlin.jvm") version kotlinVersion + id("org.jetbrains.dokka") version "1.4.32" + id("org.springframework.boot") version springBootVersion + id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion + id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion } repositories { @@ -21,9 +28,9 @@ repositories { } dependencies { - implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.4.10")) - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.10") + implementation(platform("org.jetbrains.kotlin:kotlin-bom:${kotlinVersion}")) + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}") + implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.11.3") implementation("javax.xml.bind:jaxb-api:2.3.0") implementation("io.jsonwebtoken:jjwt:0.9.1") @@ -31,23 +38,22 @@ dependencies { implementation("org.apache.pdfbox:pdfbox:2.0.4") implementation("dev.fyloz.colorrecipesexplorer:database-manager:1.2.0") - implementation("org.springframework.boot:spring-boot-starter-data-jpa:2.3.4.RELEASE") - implementation("org.springframework.boot:spring-boot-starter-jdbc:2.3.4.RELEASE") - implementation("org.springframework.boot:spring-boot-starter-web:2.3.4.RELEASE") - implementation("org.springframework.boot:spring-boot-starter-validation:2.3.4.RELEASE") - implementation("org.springframework.boot:spring-boot-starter-security:2.3.4.RELEASE") - implementation("org.springframework.boot:spring-boot-configuration-processor:2.3.4.RELEASE") - implementation("org.springframework.boot:spring-boot-devtools:2.3.4.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}") + implementation("org.springframework.boot:spring-boot-starter-jdbc:${springBootVersion}") + implementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") + implementation("org.springframework.boot:spring-boot-starter-validation:${springBootVersion}") + implementation("org.springframework.boot:spring-boot-starter-security:${springBootVersion}") + implementation("org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}") + implementation("org.springframework.boot:spring-boot-devtools:${springBootVersion}") testImplementation("org.springframework:spring-test:5.1.6.RELEASE") testImplementation("org.mockito:mockito-inline:3.6.0") testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.2") testImplementation("io.mockk:mockk:1.10.6") - testImplementation("org.springframework.boot:spring-boot-starter-test:2.3.4.RELEASE") - testImplementation("org.springframework.boot:spring-boot-test-autoconfigure:2.3.4.RELEASE") - testImplementation("org.jetbrains.kotlin:kotlin-test:1.4.10") - testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.4.10") + testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}") + testImplementation("org.springframework.boot:spring-boot-test-autoconfigure:${springBootVersion}") + testImplementation("org.jetbrains.kotlin:kotlin-test:${kotlinVersion}") runtimeOnly("com.h2database:h2:1.4.199") runtimeOnly("mysql:mysql-connector-java:8.0.22") @@ -90,8 +96,8 @@ tasks.withType().all { jvmTarget = JavaVersion.VERSION_11.toString() useIR = true freeCompilerArgs = listOf( - "-Xopt-in=kotlin.contracts.ExperimentalContracts", - "-Xinline-classes" + "-Xopt-in=kotlin.contracts.ExperimentalContracts", + "-Xinline-classes" ) } } diff --git a/src/main/kotlin/dev/fyloz/colorrecipesexplorer/model/touchupkit/TouchUpKit.kt b/src/main/kotlin/dev/fyloz/colorrecipesexplorer/model/touchupkit/TouchUpKit.kt new file mode 100644 index 0000000..7300624 --- /dev/null +++ b/src/main/kotlin/dev/fyloz/colorrecipesexplorer/model/touchupkit/TouchUpKit.kt @@ -0,0 +1,12 @@ +package dev.fyloz.colorrecipesexplorer.model.touchupkit + +data class TouchUpKit( + val id: Long, + val project: String, + val buggy: String +) + +sealed class TouchUpKitCompany { + inline class CompanyName(val name: String) + class Company(val company: Company) +}