Skip to content

Commit c896beb

Browse files
gciattogciatto
committed
fix kotlin api dependencies
1 parent a2552d5 commit c896beb

File tree

21 files changed

+52
-43
lines changed

21 files changed

+52
-43
lines changed

‎linda-core-presentation/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
dependencies {
22
api(project(":linda-core"))
33
api(project(":presentation"))
4-
5-
implementation(kotlin("stdlib-jdk8"))
4+
api(kotlin("stdlib-jdk8"))
65

76
testImplementation(Libs.junit)
87
testImplementation(project(":test-utils"))

‎linda-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dependencies {
33
api(Libs.slf4j_api)
44
api(project(":utils"))
55

6-
implementation(kotlin("stdlib-jdk8"))
6+
api(kotlin("stdlib-jdk8"))
77

88
testImplementation(Libs.junit)
99
}

‎linda-logic-client/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ dependencies {
22
api(project(":linda-logic"))
33
api(project(":linda-remote-client"))
44
api(project(":linda-logic-presentation"))
5+
api(kotlin("stdlib-jdk8"))
56
api(Libs.vertx_web_client)
67

7-
implementation(kotlin("stdlib-jdk8"))
88
implementation(project(":prologx"))
99

10-
1110
testImplementation(Libs.junit)
1211
testImplementation(project(":tusow-service"))
1312
testImplementation(project(":linda-test"))

‎linda-logic-presentation/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dependencies {
22
api(project(":linda-logic"))
33
api(project(":linda-core-presentation"))
4+
api(kotlin("stdlib-jdk8"))
45

56
implementation(project(":prologx"))
6-
implementation(kotlin("stdlib-jdk8"))
77

88
testImplementation(Libs.junit)
99
testImplementation(project(":test-utils"))

‎linda-logic/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dependencies {
22
api(Libs.`2p_core`)
33
api(project(":linda-core"))
4+
api(project(":utils"))
5+
api(kotlin("stdlib-jdk8"))
46

5-
implementation(project(":utils"))
67
implementation(project(":prologx"))
7-
implementation(kotlin("stdlib-jdk8"))
88

99
testImplementation(Libs.junit)
1010
testImplementation(project(":linda-test"))

‎linda-remote-client/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ dependencies {
22
api(project(":linda-core"))
33
api(project(":presentation"))
44
api(Libs.vertx_web_client)
5-
6-
implementation(kotlin("stdlib-jdk8"))
7-
5+
api(kotlin("stdlib-jdk8"))
86

97
testImplementation(Libs.junit)
108
}

‎linda-text-client/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ dependencies {
22
api(project(":linda-text"))
33
api(project(":linda-remote-client"))
44
api(project(":linda-text-presentation"))
5+
api(kotlin("stdlib-jdk8"))
56
api(Libs.vertx_web_client)
67

7-
implementation(kotlin("stdlib-jdk8"))
8-
9-
108
testImplementation(Libs.junit)
119
testImplementation(project(":tusow-service"))
1210
testImplementation(project(":linda-test"))

‎linda-text-presentation/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
dependencies {
22
api(project(":linda-text"))
33
api(project(":linda-core-presentation"))
4-
5-
implementation(kotlin("stdlib-jdk8"))
4+
api(kotlin("stdlib-jdk8"))
65

76
testImplementation(Libs.junit)
87
}

‎linda-text/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
dependencies {
22
api(project(":linda-core"))
3-
4-
implementation(Libs.named_regexp)
5-
implementation(kotlin("stdlib-jdk8"))
3+
api(kotlin("stdlib-jdk8"))
4+
api(Libs.named_regexp)
65

76
testImplementation(Libs.junit)
87
testImplementation(project(":linda-test"))

‎presentation/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ dependencies {
33
api(Libs.jackson_datatype_jsr310)
44
api(Libs.jackson_dataformat_xml)
55
api(Libs.jackson_dataformat_yaml)
6+
api(kotlin("stdlib-jdk8"))
7+
api(project(":utils"))
68

7-
implementation(project(":utils"))
89
implementation(project(":prologx"))
9-
implementation(kotlin("stdlib-jdk8"))
10-
1110

1211
testImplementation(Libs.junit)
1312
testImplementation(project(":test-utils"))

‎prologx/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ val ktFreeCompilerArgs: String by project
55

66
dependencies {
77
api(Libs.`2p_presentation`)
8-
9-
implementation(kotlin("stdlib-jdk8"))
8+
api(kotlin("stdlib-jdk8"))
109

1110
testImplementation(Libs.junit)
1211
}

‎test-utils/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ val junitVersion: String by project
33
val ktFreeCompilerArgs: String by project
44

55
dependencies {
6-
implementation(Libs.junit)
7-
implementation(kotlin("stdlib-jdk8"))
6+
api(kotlin("stdlib-jdk8"))
7+
api(Libs.junit)
88
}

‎tusow-cli/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@ plugins {
66
dependencies {
77
api(project(":linda-logic-client"))
88
api(project(":linda-text-client"))
9+
api(kotlin("stdlib-jdk8"))
10+
api(Libs.clikt)
911

10-
implementation(Libs.clikt)
11-
implementation(kotlin("stdlib-jdk8"))
12+
implementation(Libs.logback_classic)
1213

1314
testImplementation(Libs.junit)
1415
testImplementation(project(":tusow-service"))
1516
testImplementation(project(":linda-test"))
1617
testImplementation(project(":test-utils"))
1718
}
1819

19-
val mainClass = "it.unibo.coordination.linda.cli.TusowCommandKt"
20+
val mainClass = "it.unibo.coordination.linda.cli.Cli"
2021

2122
application {
2223
mainClassName = mainClass

‎tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/Cli.kt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package it.unibo.coordination.linda.cli
2+
3+
object Cli {
4+
@JvmStatic
5+
fun main(args: Array<String>) {
6+
try {
7+
TusowCommand().main(args)
8+
System.exit(0)
9+
} catch (e: Exception) {
10+
e.printStackTrace()
11+
System.exit(1)
12+
}
13+
}
14+
}

‎tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TusowCommand.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,4 @@ class TusowCommand() : CliktCommand(name="tusow") {
1616
}
1717

1818
override fun run() = Unit
19-
}
20-
21-
fun main(args: Array<String>) {
22-
try {
23-
TusowCommand().main(args)
24-
System.exit(0)
25-
} catch (e: Exception) {
26-
e.printStackTrace()
27-
System.exit(1)
28-
}
2919
}

‎tusow-full/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ dependencies {
77
.forEach {
88
api(project(":$it"))
99
}
10+
11+
implementation(Libs.logback_classic)
1012
}
1113

1214
tasks.getByName<Jar>("shadowJar") {

‎tusow-full/src/main/kotlin/TusowCli.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
object TusowCli {
2+
@JvmStatic
3+
fun main(args: Array<String>) {
4+
it.unibo.coordination.linda.cli.Cli.main(args)
5+
}
6+
}

‎tusow-full/src/main/kotlin/TusowService.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
object TusowService {
2+
@JvmStatic
3+
fun main(args: Array<String>) {
4+
it.unibo.coordination.tusow.Service.main(args)
5+
}
6+
}

‎tusow-service/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ dependencies {
88
api(project(":linda-logic-presentation"))
99
api(project(":linda-text"))
1010
api(project(":linda-text-presentation"))
11+
api(kotlin("stdlib-jdk8"))
1112
api(Libs.vertx_core)
1213
api(Libs.vertx_web)
1314

14-
runtimeOnly(Libs.logback_classic)
15+
implementation(Libs.logback_classic)
1516

1617
implementation(project(":prologx"))
1718
implementation(Libs.commons_cli)
@@ -20,7 +21,6 @@ dependencies {
2021
implementation(Libs.jackson_dataformat_xml)
2122
implementation(Libs.jackson_dataformat_yaml)
2223
implementation(Libs.jool)
23-
implementation(kotlin("stdlib-jdk8"))
2424

2525
testImplementation(Libs.vertx_unit)
2626
testImplementation(Libs.junit)

‎utils/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
implementation(kotlin("stdlib-jdk8"))
2+
api(kotlin("stdlib-jdk8"))
33
testImplementation(Libs.junit)
44
}

‎utils/src/main/kotlin/it/unibo/coordination/utils/events/EventListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package it.unibo.coordination.utils.events
22

3-
typealias EventListener<T> = (T) -> Any
3+
typealias EventListener<T> = (T) -> Unit

0 commit comments

Comments
 (0)