Skip to content

Commit 0cb5e1c

Browse files
authored
Merge pull request #19 from Task-Tracker-Systems/lint
Lint
2 parents e360d53 + 8c1b67d commit 0cb5e1c

File tree

51 files changed

+155
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+155
-127
lines changed

Task-Tracker-CLI/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
kotlin("jvm") version "1.8.22"
3+
id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
34
application
45
}
56

@@ -9,7 +10,7 @@ version = "1.0-SNAPSHOT"
910
repositories {
1011
mavenLocal()
1112
mavenCentral()
12-
maven ("https://jitpack.io")
13+
maven("https://jitpack.io")
1314
}
1415

1516
dependencies {
@@ -32,4 +33,4 @@ kotlin {
3233

3334
application {
3435
mainClass.set("MainKt")
35-
}
36+
}

Task-Tracker-CLI/settings.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
21
rootProject.name = "Task-Tracker-CLI"
3-

Task-Tracker-CLI/src/main/kotlin/CLI.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ import com.garbereder.tasktracker.entities.ActivityCollection
22
import com.garbereder.tasktracker.entities.ActivityCollectionImpl
33
import com.garbereder.tasktracker.entities.Task
44
import com.garbereder.tasktracker.entities.TaskCollection
5-
import com.garbereder.tasktracker.usecases.tasks.*
5+
import com.garbereder.tasktracker.usecases.tasks.ActivityCollectionReader
6+
import com.garbereder.tasktracker.usecases.tasks.AddTask
7+
import com.garbereder.tasktracker.usecases.tasks.ListTasks
8+
import com.garbereder.tasktracker.usecases.tasks.LoadActivities
9+
import com.garbereder.tasktracker.usecases.tasks.LoadTasks
10+
import com.garbereder.tasktracker.usecases.tasks.StartActivity
11+
import com.garbereder.tasktracker.usecases.tasks.StopActivity
12+
import com.garbereder.tasktracker.usecases.tasks.TaskCollectionReaderFactory
613
import com.github.kinquirer.KInquirer
714
import com.github.kinquirer.components.promptInput
815
import com.github.kinquirer.components.promptList
@@ -55,7 +62,6 @@ class CLI(private val taskCollectionReaderFactory: TaskCollectionReaderFactory)
5562
}
5663

5764
fun run() {
58-
5965
println("Welcome to Task-Tracker-CLI")
6066
val tasks = LoadTasks(taskCollectionReaderFactory.create()).invoke()
6167

@@ -74,4 +80,4 @@ class CLI(private val taskCollectionReaderFactory: TaskCollectionReaderFactory)
7480
choices[selection]!!.invoke()
7581
}
7682
}
77-
}
83+
}

Task-Tracker-CLI/src/main/kotlin/Main.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ import com.garbereder.tasktracker.usecases.DBTaskCollectionReaderFactory
33
fun main() {
44
CLI(DBTaskCollectionReaderFactory()).run()
55
}
6-

Task-Tracker-Entities-Impl/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
kotlin("multiplatform") version "1.8.22"
33
id("maven-publish")
4+
id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
45
}
56

67
group = "com.garbereder.tasktracker.entities-impl"
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
21
rootProject.name = "Task-Tracker-Entities-Impl"
3-

Task-Tracker-Entities-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/entities/ActivityCollectionImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class ActivityCollectionImpl : ActivityCollection {
1010
override fun iterator(): Iterator<Activity> = list.iterator()
1111

1212
override fun remove(activity: Activity) {
13-
if (!list.contains(activity))
13+
if (!list.contains(activity)) {
1414
throw ActivityNotFoundException(activity)
15+
}
1516
list.remove(activity)
1617
}
17-
1818
}

Task-Tracker-Entities-Impl/src/commonMain/kotlin/com/garbereder/tasktracker/entities/TaskCollectionImpl.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@ class TaskCollectionImpl : TaskCollection {
44

55
private val list = mutableListOf<Task>()
66
override fun add(task: Task) {
7-
if (list.contains(task))
7+
if (list.contains(task)) {
88
throw DuplicateTaskException(task)
9+
}
910
list.add(task)
1011
}
1112

1213
override fun iterator(): Iterator<Task> = list.iterator()
1314

1415
override fun remove(task: Task) {
15-
if (!list.contains(task))
16+
if (!list.contains(task)) {
1617
throw TaskNotFoundException(task)
18+
}
1719
list.remove(task)
1820
}
1921

2022
override fun size(): Int = list.size
21-
2223
}

Task-Tracker-Entities-Impl/src/commonTest/kotlin/com/garbereder/tasktracker/entities/TaskCollectionImplTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import kotlin.test.Test
44
import kotlin.test.assertEquals
55
import kotlin.test.assertFailsWith
66

7-
class ListTaskCollectionImpl {
7+
class TaskCollectionImplTests {
88

99
@Test
1010
fun add_once_oneEntry() {
@@ -96,4 +96,4 @@ class ListTaskCollectionImpl {
9696
col.remove(task2)
9797
}
9898
}
99-
}
99+
}

Task-Tracker-Entities/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
kotlin("multiplatform") version "1.8.22"
3+
id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
34
id("maven-publish")
45
}
56

@@ -35,7 +36,6 @@ kotlin {
3536
else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
3637
}
3738

38-
3939
sourceSets {
4040
val commonMain by getting {
4141
dependencies {

0 commit comments

Comments
 (0)