Skip to content

Commit

Permalink
Revert "feat: remove root module"
Browse files Browse the repository at this point in the history
This reverts commit 3c40c4c.
  • Loading branch information
shouwn committed Oct 24, 2023
1 parent 3c40c4c commit eb53682
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 29 deletions.
45 changes: 23 additions & 22 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import java.nio.file.Files
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
import org.gradle.internal.os.OperatingSystem
import org.jetbrains.kotlin.gradle.dsl.jvm.JvmTargetValidationMode
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.nio.file.Files

plugins {
alias(libs.plugins.kotlin.jvm)
Expand All @@ -15,33 +15,23 @@ plugins {
}

allprojects {
group = "com.linecorp.kotlin-jdsl"
version = "3.0.0"

repositories {
mavenCentral()
}
}

subprojects {
apply(plugin = "kotlin")
apply(plugin = "org.jetbrains.kotlinx.kover")
apply(plugin = "org.jmailen.kotlinter")
apply(plugin = "java-test-fixtures")
apply(plugin = "maven-publish")
apply(plugin = "signing")

rootProject.dependencies {
kover(this@subprojects)
group = "com.linecorp.kotlin-jdsl"
version = "3.0.0"

repositories {
mavenCentral()
}

dependencies {
implementation(rootProject.libs.kotlin)

if (name != rootProject.projects.core.name) {
implementation(rootProject.projects.core)
}

testImplementation(rootProject.libs.junit)
testImplementation(rootProject.libs.mockk)
testImplementation(rootProject.libs.assertJ)
Expand Down Expand Up @@ -76,12 +66,6 @@ subprojects {
}
}

kover {
excludeSourceSets {
names(sourceSets.testFixtures.name)
}
}

java {
withSourcesJar()
withJavadocJar()
Expand All @@ -103,6 +87,7 @@ subprojects {
val snapshotRepoUri = uri("https://oss.sonatype.org/content/repositories/snapshots/")
val releaseRepoUri = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")

name = "OSSRH"
url = if (version.toString().endsWith("SNAPSHOT")) snapshotRepoUri else releaseRepoUri

val sonatypeUsername: String? = System.getenv("SONATYPE_USERNAME")
Expand Down Expand Up @@ -157,6 +142,22 @@ subprojects {
}
}

subprojects {
rootProject.dependencies {
kover(this@subprojects)
}

dependencies {
implementation(rootProject)
}

kover {
excludeSourceSets {
names(sourceSets.testFixtures.name)
}
}
}

koverReport {
filters {
excludes {
Expand Down
5 changes: 0 additions & 5 deletions core/build.gradle.kts

This file was deleted.

2 changes: 0 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ module(name = ":jpql-query-model", path = "query-model/jpql")
module(name = ":render", path = "render")
module(name = ":jpql-render", path = "render/jpql")

module(name = ":core", path = "core")

module(name = ":support", path = "support")
module(name = ":spring-batch-support", path = "support/spring-batch")
module(name = ":spring-batch-javax-support", path = "support/spring-batch-javax")
Expand Down

0 comments on commit eb53682

Please sign in to comment.