From e136da540bafa7660c362f00b5ee0f820e3ad0a3 Mon Sep 17 00:00:00 2001 From: Andrea Brighi Date: Wed, 7 Jun 2023 00:05:22 +0200 Subject: [PATCH] chore(deps): update gradle-kotlin-qa from 0.43.0 to 0.44.0 and apply code style changes --- .editorconfig | 1 - app/src/main/kotlin/com/intelligentbackpack/app/App.kt | 2 +- .../com/intelligentbackpack/desktopdomain/entities/Desktop.kt | 2 +- gradle/libs.versions.toml | 2 +- .../schooldomain/entities/calendar/CalendarEventFactory.kt | 2 +- .../schooldomain/entities/person/Professor.kt | 2 +- .../kotlin/com/intelligentbackpack/schooldomain/PersonTest.kt | 2 +- .../kotlin/com/intelligentbackpack/schooldomain/SchoolTest.kt | 2 +- .../com/intelligentbackpack/schooldomain/UseCaseTest.kt | 4 ++-- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index fce4f6c1..98a30ead 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,2 @@ [*.{kt,kts}] -disabled_rules=import-ordering max_line_length=120 \ No newline at end of file diff --git a/app/src/main/kotlin/com/intelligentbackpack/app/App.kt b/app/src/main/kotlin/com/intelligentbackpack/app/App.kt index 1350910b..9c793976 100644 --- a/app/src/main/kotlin/com/intelligentbackpack/app/App.kt +++ b/app/src/main/kotlin/com/intelligentbackpack/app/App.kt @@ -1,8 +1,8 @@ package com.intelligentbackpack.app import android.app.Application -import com.intelligentbackpack.app.di.ServiceLocator import com.intelligentbackpack.accessdomain.usecase.AccessUseCase +import com.intelligentbackpack.app.di.ServiceLocator import com.intelligentbackpack.desktopdomain.usecase.DesktopUseCase /** diff --git a/desktopDomain/src/main/kotlin/com/intelligentbackpack/desktopdomain/entities/Desktop.kt b/desktopDomain/src/main/kotlin/com/intelligentbackpack/desktopdomain/entities/Desktop.kt index 3cdc2b96..5a97372a 100644 --- a/desktopDomain/src/main/kotlin/com/intelligentbackpack/desktopdomain/entities/Desktop.kt +++ b/desktopDomain/src/main/kotlin/com/intelligentbackpack/desktopdomain/entities/Desktop.kt @@ -2,8 +2,8 @@ package com.intelligentbackpack.desktopdomain.entities import com.intelligentbackpack.desktopdomain.entities.implementations.DesktopImpl import com.intelligentbackpack.desktopdomain.exception.BackpackAlreadyAssociatedException -import com.intelligentbackpack.desktopdomain.exception.DuplicateRFIDException import com.intelligentbackpack.desktopdomain.exception.BackpackNotAssociatedException +import com.intelligentbackpack.desktopdomain.exception.DuplicateRFIDException import com.intelligentbackpack.desktopdomain.exception.TypeException /** diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6490646d..ba85e816 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -140,7 +140,7 @@ dokka = "org.jetbrains.dokka:1.8.20" android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } application = { id = "com.android.application", version.ref = "gradle" } library = { id = "com.android.library", version.ref = "gradle" } -kotlin-qa = { id = "org.danilopianini.gradle-kotlin-qa", version = "0.43.0" } +kotlin-qa = { id = "org.danilopianini.gradle-kotlin-qa", version = "0.44.0" } taskTree = { id = "com.dorongold.task-tree", version = "2.1.1" } protobuf-plugin = { id = "com.google.protobuf", version = "0.9.3" } sem-ver = { id = "io.github.andreabrighi.android-git-sensitive-semantic-versioning-gradle-plugin", version = "1.0.2" } diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/CalendarEventFactory.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/CalendarEventFactory.kt index ae583b88..25019095 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/CalendarEventFactory.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/calendar/CalendarEventFactory.kt @@ -1,8 +1,8 @@ package com.intelligentbackpack.schooldomain.entities.calendar +import com.intelligentbackpack.schooldomain.entities.Class import com.intelligentbackpack.schooldomain.entities.Subject import com.intelligentbackpack.schooldomain.entities.person.Professor -import com.intelligentbackpack.schooldomain.entities.Class import java.time.DayOfWeek import java.time.LocalDate import java.time.LocalTime diff --git a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Professor.kt b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Professor.kt index 282ebe45..f588541d 100644 --- a/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Professor.kt +++ b/schoolDomain/src/main/kotlin/com/intelligentbackpack/schooldomain/entities/person/Professor.kt @@ -1,7 +1,7 @@ package com.intelligentbackpack.schooldomain.entities.person -import com.intelligentbackpack.schooldomain.entities.Subject import com.intelligentbackpack.schooldomain.entities.Class +import com.intelligentbackpack.schooldomain.entities.Subject /** * A professor. diff --git a/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/PersonTest.kt b/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/PersonTest.kt index 5230e9fd..faf2892b 100644 --- a/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/PersonTest.kt +++ b/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/PersonTest.kt @@ -4,9 +4,9 @@ import com.intelligentbackpack.schooldomain.entities.Class import com.intelligentbackpack.schooldomain.entities.School import com.intelligentbackpack.schooldomain.entities.Subject import com.intelligentbackpack.schooldomain.entities.person.Professor -import io.kotest.core.spec.style.StringSpec import com.intelligentbackpack.schooldomain.entities.person.Student import io.kotest.assertions.throwables.shouldThrow +import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe class PersonTest : StringSpec({ diff --git a/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/SchoolTest.kt b/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/SchoolTest.kt index 9b8452bd..a377d04e 100644 --- a/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/SchoolTest.kt +++ b/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/SchoolTest.kt @@ -1,7 +1,7 @@ package com.intelligentbackpack.schooldomain -import com.intelligentbackpack.schooldomain.entities.School import com.intelligentbackpack.schooldomain.entities.Class +import com.intelligentbackpack.schooldomain.entities.School import com.intelligentbackpack.schooldomain.entities.person.Professor import com.intelligentbackpack.schooldomain.entities.person.Student import io.kotest.assertions.throwables.shouldThrow diff --git a/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/UseCaseTest.kt b/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/UseCaseTest.kt index 7fdf6e20..04e5da45 100644 --- a/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/UseCaseTest.kt +++ b/schoolDomain/src/test/kotlin/com/intelligentbackpack/schooldomain/UseCaseTest.kt @@ -1,8 +1,8 @@ package com.intelligentbackpack.schooldomain import com.intelligentbackpack.accessdomain.entities.Role -import io.kotest.core.spec.style.StringSpec import com.intelligentbackpack.accessdomain.entities.User +import com.intelligentbackpack.accessdomain.exceptions.ActionNotAllowedForUserException import com.intelligentbackpack.accessdomain.usecase.AccessUseCase import com.intelligentbackpack.schooldomain.entities.Class import com.intelligentbackpack.schooldomain.entities.School @@ -11,9 +11,9 @@ import com.intelligentbackpack.schooldomain.entities.calendar.SchoolCalendar import com.intelligentbackpack.schooldomain.entities.calendar.alteration.AlterationFactory import com.intelligentbackpack.schooldomain.entities.person.Professor import com.intelligentbackpack.schooldomain.entities.person.Student -import com.intelligentbackpack.accessdomain.exceptions.ActionNotAllowedForUserException import com.intelligentbackpack.schooldomain.repository.SchoolRepository import com.intelligentbackpack.schooldomain.usecase.SchoolUseCase +import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe import io.mockk.coEvery import io.mockk.coVerify