Skip to content

Move vaildator project from root #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 19, 2024
Merged

Move vaildator project from root #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
076928f
Extract properties configuration into different script
OptimumCode Jun 19, 2024
d0b8b64
Move validator project from root to sub-project
OptimumCode Jun 19, 2024
a871cb0
Update workflows
OptimumCode Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ jobs:
with:
gradle-version: wrapper
- name: Build and publish release
run: ./gradlew --no-daemon --info :assemble publish closeAndReleaseStagingRepositories -Pversion=${{ needs.version.outputs.RELEASE_VERSION }} -x :benchmark:benchmark
run: >
./gradlew --no-daemon --info :json-schema-validator:assemble
publish closeAndReleaseStagingRepositories
-Pversion=${{ needs.version.outputs.RELEASE_VERSION }}
-x :benchmark:benchmark
env:
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
./gradlew
--no-daemon
--info
:assemble
:json-schema-validator:assemble
publish
-x :benchmark:benchmark
env:
Expand Down
6 changes: 1 addition & 5 deletions benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ plugins {
alias(libs.plugins.kotlin.allopen)
}

repositories {
mavenCentral()
}

allOpen {
annotation("org.openjdk.jmh.annotations.State")
}
Expand All @@ -30,7 +26,7 @@ kotlin {
sourceSets {
commonMain {
dependencies {
implementation(project(":"))
implementation(project(":json-schema-validator"))
implementation(libs.kotlin.benchmark)
implementation(libs.okio.common)
implementation(libs.kotlin.serialization.json.okio)
Expand Down
323 changes: 6 additions & 317 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,331 +1,20 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
import java.util.Locale

plugins {
alias(libs.plugins.kotlin.mutliplatform)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.kotest.multiplatform)
alias(libs.plugins.kover)
alias(libs.plugins.detekt)
alias(libs.plugins.ktlint)
alias(libs.plugins.kotlin.mutliplatform) apply false
alias(libs.plugins.kotlin.binaryCompatibility)
alias(libs.plugins.kotlin.dokka)
alias(libs.plugins.nexus.publish)
id("convention.publication")
id("convention.properties")
}

repositories {
mavenCentral()
allprojects {
repositories {
mavenCentral()
}
}

apiValidation {
ignoredProjects += listOf("benchmark", "test-suites", "generator")
}

val generatedSourceDirectory: Provider<Directory> = layout.buildDirectory.dir("generated/source/unicode")

//region Generation tasks block
val generatorConfiguration: Configuration by configurations.creating

dependencies {
generatorConfiguration(project(":generator"))
}

val dumpDir: File = layout.projectDirectory.dir("unicode_dump").asFile

val dumpCharacterData by tasks.register<JavaExec>("dumpCharacterData") {
onlyIf {
dumpDir.run { !exists() || listFiles().isNullOrEmpty() }
}
outputs.dir(dumpDir)
classpath(generatorConfiguration)
mainClass.set("io.github.optimumcode.unocode.generator.Main")
args(
"dump",
"-o",
dumpDir,
)
}

val generateCharacterDirectionData by tasks.register<JavaExec>("generateCharacterDirectionData") {
inputs.dir(dumpDir)
outputs.dir(generatedSourceDirectory)

dependsOn(dumpCharacterData)

classpath(generatorConfiguration)
mainClass.set("io.github.optimumcode.unocode.generator.Main")
args(
"character-direction",
"-p",
"io.github.optimumcode.json.schema.internal.unicode",
"-o",
generatedSourceDirectory.get(),
"-d",
dumpDir,
)
}

val generateCharacterCategoryData by tasks.register<JavaExec>("generateCharacterCategoryData") {
inputs.dir(dumpDir)
outputs.dir(generatedSourceDirectory)

dependsOn(dumpCharacterData)

classpath(generatorConfiguration)
mainClass.set("io.github.optimumcode.unocode.generator.Main")
args(
"character-category",
"-p",
"io.github.optimumcode.json.schema.internal.unicode",
"-o",
generatedSourceDirectory.get(),
"-d",
dumpDir,
)
}

val generateDerivedProperties by tasks.register<JavaExec>("generateDerivedProperties") {
val dataFile =
layout.projectDirectory
.dir("generator")
.dir("data")
.file("rfc5895_appendix_b_1.txt")
inputs.file(dataFile)
outputs.dir(generatedSourceDirectory)

classpath(generatorConfiguration)
mainClass.set("io.github.optimumcode.unocode.generator.Main")
args(
"derived-properties",
"-p",
"io.github.optimumcode.json.schema.internal.unicode",
"-o",
generatedSourceDirectory.get(),
"-d",
dataFile,
)
}

val generateJoiningTypes by tasks.register<JavaExec>("generateJoiningTypes") {
val dataFile =
layout.projectDirectory
.dir("generator")
.dir("data")
.file("DerivedJoiningType.txt")
inputs.file(dataFile)
outputs.dir(generatedSourceDirectory)

classpath(generatorConfiguration)
mainClass.set("io.github.optimumcode.unocode.generator.Main")
args(
"joining-types",
"-p",
"io.github.optimumcode.json.schema.internal.unicode",
"-o",
generatedSourceDirectory.get(),
"-d",
dataFile,
)
}
//endregion

kotlin {
explicitApi()

@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {
freeCompilerArgs.add("-opt-in=io.github.optimumcode.json.schema.ExperimentalApi")
}
jvmToolchain(11)
jvm {
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
}
js(IR) {
browser {
commonWebpackConfig {
cssSupport {
enabled.set(true)
}
}
}
generateTypeScriptDefinitions()
nodejs()
}
applyDefaultHierarchyTemplate()

val macOsTargets =
listOf<KotlinTarget>(
macosX64(),
macosArm64(),
iosX64(),
iosArm64(),
iosSimulatorArm64(),
)

val linuxTargets =
listOf<KotlinTarget>(
linuxX64(),
linuxArm64(),
)

val windowsTargets =
listOf<KotlinTarget>(
mingwX64(),
)

sourceSets {
commonMain {
kotlin.srcDirs(generatedSourceDirectory)

dependencies {
api(libs.kotlin.serialization.json)
api(libs.uri)
// When using approach like above you won't be able to add because block
implementation(
libs.kotlin.codepoints
.get()
.toString(),
) {
because("simplifies work with unicode codepoints")
}
implementation(libs.normalize.get().toString()) {
because("provides normalization required by IDN-hostname format")
}
}
}
commonTest {
dependencies {
implementation(libs.kotest.assertions.core)
implementation(libs.kotest.framework.engine)
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
jvmTest {
dependencies {
implementation(libs.kotest.runner.junit5)
}
}
}

fun Task.addGeneratedTasks() {
dependsOn(
generateCharacterDirectionData,
generateCharacterCategoryData,
generateDerivedProperties,
generateJoiningTypes,
)
}

targets.configureEach {
val capitalizedTargetName =
name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
tasks.named("compileKotlin$capitalizedTargetName") {
addGeneratedTasks()
}
}
afterEvaluate {
targets.configureEach {
tasks.named("${name}SourcesJar") {
addGeneratedTasks()
}
}
tasks.named("sourcesJar") {
addGeneratedTasks()
}
}

afterEvaluate {
fun Task.dependsOnTargetTests(targets: List<KotlinTarget>) {
targets.forEach {
if (it is KotlinTargetWithTests<*, *>) {
dependsOn(tasks.getByName("${it.name}Test"))
}
}
}
tasks.register("macOsAllTest") {
group = "verification"
description = "runs all tests for MacOS and IOS targets"
dependsOnTargetTests(macOsTargets)
}
tasks.register("windowsAllTest") {
group = "verification"
description = "runs all tests for Windows targets"
dependsOnTargetTests(windowsTargets)
}
tasks.register("linuxAllTest") {
group = "verification"
description = "runs all tests for Linux targets"
dependsOnTargetTests(linuxTargets)
dependsOn(tasks.getByName("jvmTest"))
dependsOn(tasks.getByName("jsTest"))
}
}
}

afterEvaluate {
val taskNames = setOf("compile", "detekt", "runKtlint")
tasks.configureEach {
// There is something wrong with compileCommonMainKotlinMetadata task
// Gradle cannot find it, but this task uses the generated source directory
// and Gradle reports implicit dependency.
// As a workaround I do this - seems like it is working.
// However, I might be missing something. Need to revisit this later.

if (taskNames.any { name.startsWith(it) }) {
mustRunAfter(
generateCharacterDirectionData,
generateCharacterCategoryData,
generateDerivedProperties,
generateJoiningTypes,
)
}
}
}

kover {
reports {
filters {
excludes {
packages(
"io.github.optimumcode.json.schema.internal.unicode.*",
"io.github.optimumcode.json.schema.internal.unicode",
)
}
}
}
}

ktlint {
version.set(libs.versions.ktlint)
reporters {
reporter(ReporterType.HTML)
}
filter {
exclude { el ->
val absolutePath = el.file.absolutePath
absolutePath.contains("generated").and(!el.isDirectory)
}
}
}

afterEvaluate {
val detektAllTask by tasks.register("detektAll") {
dependsOn(tasks.withType<Detekt>())
}

tasks.named("check").configure {
dependsOn(detektAllTask)
}
}

val ossrhUsername: String by project.ext
val ossrhPassword: String by project.ext

Expand Down
Loading
Loading