From f7d055ac97e509ecbd865f693e2a3bed6ddc61e3 Mon Sep 17 00:00:00 2001 From: Andrey Shcheglov Date: Tue, 13 Jun 2023 17:39:34 +0300 Subject: [PATCH] Rename the project --- README.md | 4 ++-- {kompdb-core => kompiledb-core}/.gitignore | 0 {kompdb-core => kompiledb-core}/build.gradle.kts | 3 ++- .../kompiledb}/core/CompilationCommand.kt | 2 +- .../kompiledb}/core/CompilationDatabase.kt | 2 +- .../com/saveourtool/kompiledb}/core/EnvPath.kt | 4 ++-- .../kotlin/com/saveourtool/kompiledb}/core/JsonIo.kt | 2 +- .../kompiledb}/core/CompilationCommandTest.kt | 4 ++-- {kompdb-gson => kompiledb-gson}/.gitignore | 0 {kompdb-gson => kompiledb-gson}/build.gradle.kts | 5 +++-- .../kompiledb}/core/JsonIoExtensionsGson.kt | 6 +++--- .../kompiledb}/gson/CompilationDatabaseAdapter.kt | 6 +++--- .../kotlin/com/saveourtool/kompiledb}/gson/GsonIo.kt | 8 ++++---- .../kompiledb}/gson/CompilationDatabaseGsonTest.kt | 12 ++++++------ settings.gradle.kts | 6 +++--- 15 files changed, 33 insertions(+), 31 deletions(-) rename {kompdb-core => kompiledb-core}/.gitignore (100%) rename {kompdb-core => kompiledb-core}/build.gradle.kts (90%) rename {kompdb-core/src/main/kotlin/com/saveourtool/kompdb => kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb}/core/CompilationCommand.kt (99%) rename {kompdb-core/src/main/kotlin/com/saveourtool/kompdb => kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb}/core/CompilationDatabase.kt (90%) rename {kompdb-core/src/main/kotlin/com/saveourtool/kompdb => kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb}/core/EnvPath.kt (93%) rename {kompdb-core/src/main/kotlin/com/saveourtool/kompdb => kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb}/core/JsonIo.kt (93%) rename {kompdb-core/src/test/kotlin/com/saveourtool/kompdb => kompiledb-core/src/test/kotlin/com/saveourtool/kompiledb}/core/CompilationCommandTest.kt (92%) rename {kompdb-gson => kompiledb-gson}/.gitignore (100%) rename {kompdb-gson => kompiledb-gson}/build.gradle.kts (87%) rename {kompdb-gson/src/main/kotlin/com/saveourtool/kompdb => kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb}/core/JsonIoExtensionsGson.kt (75%) rename {kompdb-gson/src/main/kotlin/com/saveourtool/kompdb => kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb}/gson/CompilationDatabaseAdapter.kt (80%) rename {kompdb-gson/src/main/kotlin/com/saveourtool/kompdb => kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb}/gson/GsonIo.kt (70%) rename {kompdb-gson/src/test/kotlin/com/saveourtool/kompdb => kompiledb-gson/src/test/kotlin/com/saveourtool/kompiledb}/gson/CompilationDatabaseGsonTest.kt (87%) diff --git a/README.md b/README.md index 002902a..ac7aa07 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# kompdb +# kompiledb [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) _Kotlin_ bindings to [_JSON Compilation Database_](http://clang.llvm.org/docs/JSONCompilationDatabase.html) Format. -This library is inspired by tools such as [Sarcasm/compdb](https://github.com/Sarcasm/compdb) and [rizsotto/Bear](https://github.com/rizsotto/Bear). +This library is inspired by tools such as [nickdiego/compiledb](https://github.com/nickdiego/compiledb) and [rizsotto/Bear](https://github.com/rizsotto/Bear). diff --git a/kompdb-core/.gitignore b/kompiledb-core/.gitignore similarity index 100% rename from kompdb-core/.gitignore rename to kompiledb-core/.gitignore diff --git a/kompdb-core/build.gradle.kts b/kompiledb-core/build.gradle.kts similarity index 90% rename from kompdb-core/build.gradle.kts rename to kompiledb-core/build.gradle.kts index 7dfce2f..f952d07 100644 --- a/kompdb-core/build.gradle.kts +++ b/kompiledb-core/build.gradle.kts @@ -49,6 +49,7 @@ tasks.withType { } filter { - includeTestsMatching("com.saveourtool.kompdb.*") + includeTestsMatching("com.saveourtool.kompiledb.core.*") + isFailOnNoMatchingTests = true } } diff --git a/kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/CompilationCommand.kt b/kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/CompilationCommand.kt similarity index 99% rename from kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/CompilationCommand.kt rename to kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/CompilationCommand.kt index 2bb080f..bc97828 100644 --- a/kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/CompilationCommand.kt +++ b/kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/CompilationCommand.kt @@ -1,4 +1,4 @@ -package com.saveourtool.kompdb.core +package com.saveourtool.kompiledb.core import org.intellij.lang.annotations.Language diff --git a/kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/CompilationDatabase.kt b/kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/CompilationDatabase.kt similarity index 90% rename from kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/CompilationDatabase.kt rename to kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/CompilationDatabase.kt index 1bb5688..c99cb43 100644 --- a/kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/CompilationDatabase.kt +++ b/kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/CompilationDatabase.kt @@ -1,4 +1,4 @@ -package com.saveourtool.kompdb.core +package com.saveourtool.kompiledb.core /** * A [_JSON Compilation Database_](https://clang.llvm.org/docs/JSONCompilationDatabase.html). diff --git a/kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/EnvPath.kt b/kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/EnvPath.kt similarity index 93% rename from kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/EnvPath.kt rename to kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/EnvPath.kt index 88c26fb..2d59d26 100644 --- a/kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/EnvPath.kt +++ b/kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/EnvPath.kt @@ -1,8 +1,8 @@ -package com.saveourtool.kompdb.core +package com.saveourtool.kompiledb.core +import java.nio.file.InvalidPathException import java.nio.file.Path import kotlin.io.path.Path -import java.nio.file.InvalidPathException import kotlin.io.path.pathString /** diff --git a/kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/JsonIo.kt b/kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/JsonIo.kt similarity index 93% rename from kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/JsonIo.kt rename to kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/JsonIo.kt index dcac920..418e9b9 100644 --- a/kompdb-core/src/main/kotlin/com/saveourtool/kompdb/core/JsonIo.kt +++ b/kompiledb-core/src/main/kotlin/com/saveourtool/kompiledb/core/JsonIo.kt @@ -1,4 +1,4 @@ -package com.saveourtool.kompdb.core +package com.saveourtool.kompiledb.core import org.intellij.lang.annotations.Language diff --git a/kompdb-core/src/test/kotlin/com/saveourtool/kompdb/core/CompilationCommandTest.kt b/kompiledb-core/src/test/kotlin/com/saveourtool/kompiledb/core/CompilationCommandTest.kt similarity index 92% rename from kompdb-core/src/test/kotlin/com/saveourtool/kompdb/core/CompilationCommandTest.kt rename to kompiledb-core/src/test/kotlin/com/saveourtool/kompiledb/core/CompilationCommandTest.kt index d50466d..5edefd3 100644 --- a/kompdb-core/src/test/kotlin/com/saveourtool/kompdb/core/CompilationCommandTest.kt +++ b/kompiledb-core/src/test/kotlin/com/saveourtool/kompiledb/core/CompilationCommandTest.kt @@ -1,10 +1,10 @@ -package com.saveourtool.kompdb.core +package com.saveourtool.kompiledb.core import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.equals.shouldBeEqual import io.kotest.matchers.nulls.shouldNotBeNull import kotlin.test.Test -import com.saveourtool.kompdb.core.EnvPath as Path +import com.saveourtool.kompiledb.core.EnvPath as Path /** * @see CompilationCommand diff --git a/kompdb-gson/.gitignore b/kompiledb-gson/.gitignore similarity index 100% rename from kompdb-gson/.gitignore rename to kompiledb-gson/.gitignore diff --git a/kompdb-gson/build.gradle.kts b/kompiledb-gson/build.gradle.kts similarity index 87% rename from kompdb-gson/build.gradle.kts rename to kompiledb-gson/build.gradle.kts index 072c194..964dc17 100644 --- a/kompdb-gson/build.gradle.kts +++ b/kompiledb-gson/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } dependencies { - api(project(":kompdb-core")) + api(project(":kompiledb-core")) implementation(libs.google.gson) testApi(libs.kotest.assertions.core) testApi(libs.kotest.assertions.json) @@ -51,6 +51,7 @@ tasks.withType { } filter { - includeTestsMatching("com.saveourtool.kompdb.*") + includeTestsMatching("com.saveourtool.kompiledb.gson.*") + isFailOnNoMatchingTests = true } } diff --git a/kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/core/JsonIoExtensionsGson.kt b/kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/core/JsonIoExtensionsGson.kt similarity index 75% rename from kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/core/JsonIoExtensionsGson.kt rename to kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/core/JsonIoExtensionsGson.kt index 83a25cf..b1a764b 100644 --- a/kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/core/JsonIoExtensionsGson.kt +++ b/kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/core/JsonIoExtensionsGson.kt @@ -1,9 +1,9 @@ @file:JvmName("JsonIoExtensionsGson") -package com.saveourtool.kompdb.core +package com.saveourtool.kompiledb.core -import com.saveourtool.kompdb.core.JsonIo.Factory -import com.saveourtool.kompdb.gson.GsonIo +import com.saveourtool.kompiledb.core.JsonIo.Factory +import com.saveourtool.kompiledb.gson.GsonIo import com.google.gson.GsonBuilder /** diff --git a/kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/gson/CompilationDatabaseAdapter.kt b/kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/gson/CompilationDatabaseAdapter.kt similarity index 80% rename from kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/gson/CompilationDatabaseAdapter.kt rename to kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/gson/CompilationDatabaseAdapter.kt index ce147c4..fd0054b 100644 --- a/kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/gson/CompilationDatabaseAdapter.kt +++ b/kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/gson/CompilationDatabaseAdapter.kt @@ -1,7 +1,7 @@ -package com.saveourtool.kompdb.gson +package com.saveourtool.kompiledb.gson -import com.saveourtool.kompdb.core.CompilationCommand -import com.saveourtool.kompdb.core.CompilationDatabase +import com.saveourtool.kompiledb.core.CompilationCommand +import com.saveourtool.kompiledb.core.CompilationDatabase import com.google.gson.JsonArray import com.google.gson.JsonSerializationContext import com.google.gson.JsonSerializer diff --git a/kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/gson/GsonIo.kt b/kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/gson/GsonIo.kt similarity index 70% rename from kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/gson/GsonIo.kt rename to kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/gson/GsonIo.kt index d67d467..4ef1f3f 100644 --- a/kompdb-gson/src/main/kotlin/com/saveourtool/kompdb/gson/GsonIo.kt +++ b/kompiledb-gson/src/main/kotlin/com/saveourtool/kompiledb/gson/GsonIo.kt @@ -1,8 +1,8 @@ -package com.saveourtool.kompdb.gson +package com.saveourtool.kompiledb.gson -import com.saveourtool.kompdb.core.CompilationCommand -import com.saveourtool.kompdb.core.CompilationDatabase -import com.saveourtool.kompdb.core.JsonIo +import com.saveourtool.kompiledb.core.CompilationCommand +import com.saveourtool.kompiledb.core.CompilationDatabase +import com.saveourtool.kompiledb.core.JsonIo import com.google.gson.Gson import com.google.gson.GsonBuilder diff --git a/kompdb-gson/src/test/kotlin/com/saveourtool/kompdb/gson/CompilationDatabaseGsonTest.kt b/kompiledb-gson/src/test/kotlin/com/saveourtool/kompiledb/gson/CompilationDatabaseGsonTest.kt similarity index 87% rename from kompdb-gson/src/test/kotlin/com/saveourtool/kompdb/gson/CompilationDatabaseGsonTest.kt rename to kompiledb-gson/src/test/kotlin/com/saveourtool/kompiledb/gson/CompilationDatabaseGsonTest.kt index 8945185..0a98004 100644 --- a/kompdb-gson/src/test/kotlin/com/saveourtool/kompdb/gson/CompilationDatabaseGsonTest.kt +++ b/kompiledb-gson/src/test/kotlin/com/saveourtool/kompiledb/gson/CompilationDatabaseGsonTest.kt @@ -1,14 +1,14 @@ -package com.saveourtool.kompdb.gson +package com.saveourtool.kompiledb.gson -import com.saveourtool.kompdb.core.CompilationCommand -import com.saveourtool.kompdb.core.CompilationDatabase -import com.saveourtool.kompdb.core.JsonIo -import com.saveourtool.kompdb.core.gson +import com.saveourtool.kompiledb.core.CompilationCommand +import com.saveourtool.kompiledb.core.CompilationDatabase +import com.saveourtool.kompiledb.core.JsonIo +import com.saveourtool.kompiledb.core.gson import io.kotest.assertions.json.shouldBeEmptyJsonArray import io.kotest.assertions.json.shouldEqualJson import org.intellij.lang.annotations.Language import kotlin.test.Test -import com.saveourtool.kompdb.core.EnvPath as Path +import com.saveourtool.kompiledb.core.EnvPath as Path /** * @see CompilationDatabase diff --git a/settings.gradle.kts b/settings.gradle.kts index 6422220..b90cda3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "kompdb" +rootProject.name = "kompiledb" pluginManagement { repositories { @@ -11,8 +11,8 @@ plugins { id("com.gradle.enterprise") version "3.13.3" } -include("kompdb-core") -include("kompdb-gson") +include("kompiledb-core") +include("kompiledb-gson") gradleEnterprise { if (System.getenv("CI") != null) {