Skip to content

Commit

Permalink
gradle: compile->api/impl
Browse files Browse the repository at this point in the history
  • Loading branch information
mvysny committed Apr 7, 2021
1 parent a46b65b commit 567dee5
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 47 deletions.
8 changes: 4 additions & 4 deletions vok-db/build.gradle.kts
@@ -1,8 +1,8 @@
dependencies {
compile(project(":vok-framework"))
compile("com.github.mvysny.vokorm:vok-orm:${properties["vok_orm_version"]}")
compile("com.github.mvysny.vokdataloader:vok-dataloader:${properties["vok_dataloader_version"]}")
testCompile("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
api(project(":vok-framework"))
api("com.github.mvysny.vokorm:vok-orm:${properties["vok_orm_version"]}")
api("com.github.mvysny.vokdataloader:vok-dataloader:${properties["vok_dataloader_version"]}")
testImplementation("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
}

val configureBintray = ext["configureBintray"] as (artifactId: String, description: String) -> Unit
Expand Down
14 changes: 7 additions & 7 deletions vok-framework-v17-vokdb/build.gradle.kts
@@ -1,14 +1,14 @@
dependencies {
compile(project(":vok-framework-vokdb")) {
api(project(":vok-framework-vokdb")) {
exclude(module = "vaadin-core")
}
compile("com.vaadin:vaadin-core:${properties["vaadin17_version"]}")
api("com.vaadin:vaadin-core:${properties["vaadin17_version"]}")

testCompile("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testCompile("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
testCompile("com.h2database:h2:${properties["h2_version"]}")
testCompile("com.zaxxer:HikariCP:${properties["hikaricp_version"]}")
testCompile("com.github.mvysny.kaributesting:karibu-testing-v10:${properties["kaributesting_version"]}")
testImplementation("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testImplementation("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
testImplementation("com.h2database:h2:${properties["h2_version"]}")
testImplementation("com.zaxxer:HikariCP:${properties["hikaricp_version"]}")
testImplementation("com.github.mvysny.kaributesting:karibu-testing-v10:${properties["kaributesting_version"]}")
}

kotlin {
Expand Down
16 changes: 8 additions & 8 deletions vok-framework-vokdb/build.gradle.kts
@@ -1,13 +1,13 @@
dependencies {
compile(project(":vok-framework"))
compile(project(":vok-db"))
compile(project(":vok-util-vaadin"))
api(project(":vok-framework"))
api(project(":vok-db"))
api(project(":vok-util-vaadin"))

testCompile("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testCompile("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
testCompile("com.h2database:h2:${properties["h2_version"]}")
testCompile("com.zaxxer:HikariCP:${properties["hikaricp_version"]}")
testCompile("com.github.mvysny.kaributesting:karibu-testing-v10:${properties["kaributesting_version"]}")
testImplementation("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testImplementation("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
testImplementation("com.h2database:h2:${properties["h2_version"]}")
testImplementation("com.zaxxer:HikariCP:${properties["hikaricp_version"]}")
testImplementation("com.github.mvysny.kaributesting:karibu-testing-v10:${properties["kaributesting_version"]}")
}

kotlin {
Expand Down
8 changes: 4 additions & 4 deletions vok-framework/build.gradle.kts
@@ -1,8 +1,8 @@
dependencies {
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
compile("org.slf4j:slf4j-api:${properties["slf4j_version"]}")
testCompile("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testCompile("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.slf4j:slf4j-api:${properties["slf4j_version"]}")
testImplementation("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testImplementation("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
}

kotlin {
Expand Down
18 changes: 9 additions & 9 deletions vok-rest-client/build.gradle.kts
@@ -1,18 +1,18 @@
dependencies {
compile(project(":vok-framework"))
api(project(":vok-framework"))

compile("com.google.code.gson:gson:2.8.5")
compile("com.squareup.moshi:moshi:1.11.0")
compile("com.squareup.okhttp3:okhttp:4.0.0")
compile("com.github.mvysny.vokdataloader:vok-dataloader:${properties["vok_dataloader_version"]}")
api("com.google.code.gson:gson:2.8.5")
api("com.squareup.moshi:moshi:1.11.0")
api("com.squareup.okhttp3:okhttp:4.0.0")
api("com.github.mvysny.vokdataloader:vok-dataloader:${properties["vok_dataloader_version"]}")

// this project is actually tested in the vok-rest project, where it is used as a test dependency. For tests please see vok-rest
testCompile("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testCompile("io.javalin:javalin:${properties["javalin_version"]}")
testCompile("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
testImplementation("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testImplementation("io.javalin:javalin:${properties["javalin_version"]}")
testImplementation("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")

// temporary: add kotlin-reflect until https://github.com/mvysny/vaadin-on-kotlin/issues/60 is sorted out.
testCompile("com.squareup.moshi:moshi-kotlin:1.11.0")
testImplementation("com.squareup.moshi:moshi-kotlin:1.11.0")
}

kotlin {
Expand Down
8 changes: 4 additions & 4 deletions vok-rest/build.gradle.kts
@@ -1,12 +1,12 @@
dependencies {
compile(project(":vok-framework"))
api(project(":vok-framework"))

compile("io.javalin:javalin:${properties["javalin_version"]}") {
api("io.javalin:javalin:${properties["javalin_version"]}") {
exclude(mapOf("group" to "org.eclipse.jetty"))
exclude(mapOf("group" to "org.eclipse.jetty.websocket"))
}
compile("com.google.code.gson:gson:2.8.5")
compile(project(":vok-db"))
api("com.google.code.gson:gson:2.8.5")
api(project(":vok-db"))

// testing of the CRUD interface
testImplementation("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
Expand Down
4 changes: 2 additions & 2 deletions vok-security/build.gradle.kts
@@ -1,6 +1,6 @@
dependencies {
compile(project(":vok-framework"))
testCompile("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
api(project(":vok-framework"))
testImplementation("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
}

kotlin {
Expand Down
18 changes: 9 additions & 9 deletions vok-util-vaadin/build.gradle.kts
@@ -1,24 +1,24 @@
dependencies {
compile(project(":vok-framework"))
compile(project(":vok-security"))
api(project(":vok-framework"))
api(project(":vok-security"))

compile("com.github.mvysny.vokdataloader:vok-dataloader:${properties["vok_dataloader_version"]}")
api("com.github.mvysny.vokdataloader:vok-dataloader:${properties["vok_dataloader_version"]}")

// Vaadin
compile("com.github.mvysny.karibudsl:karibu-dsl:${properties["karibudsl_version"]}")
compile("com.vaadin:vaadin-core:${properties["vaadin10_version"]}") {
api("com.github.mvysny.karibudsl:karibu-dsl:${properties["karibudsl_version"]}")
api("com.vaadin:vaadin-core:${properties["vaadin10_version"]}") {
// Webjars are only needed when running in Vaadin 13 compatibility mode
listOf("com.vaadin.webjar", "org.webjars.bowergithub.insites",
"org.webjars.bowergithub.polymer", "org.webjars.bowergithub.polymerelements",
"org.webjars.bowergithub.vaadin", "org.webjars.bowergithub.webcomponents")
.forEach { group -> exclude(group = group) }
}
compile("javax.servlet:javax.servlet-api:3.1.0")
api("javax.servlet:javax.servlet-api:3.1.0")

// testing
testCompile("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testCompile("com.github.mvysny.kaributesting:karibu-testing-v10:${properties["kaributesting_version"]}")
testCompile("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
testImplementation("com.github.mvysny.dynatest:dynatest-engine:${properties["dynatest_version"]}")
testImplementation("com.github.mvysny.kaributesting:karibu-testing-v10:${properties["kaributesting_version"]}")
testImplementation("org.slf4j:slf4j-simple:${properties["slf4j_version"]}")
}

kotlin {
Expand Down

0 comments on commit 567dee5

Please sign in to comment.