From 761e08558ff20c8815dc2366050b7f5708702bfa Mon Sep 17 00:00:00 2001 From: Travis Wyatt Date: Mon, 8 Jul 2024 12:23:30 -0700 Subject: [PATCH] Rename Maven artifact `koap` to `koap-core` (#278) --- build.gradle.kts | 6 ++++-- gradle.properties | 1 - koap/api/koap.api => koap-core/api/koap-core.api | 0 {koap => koap-core}/build.gradle.kts | 0 .../src/commonMain/kotlin/ByteArrayReader.kt | 0 {koap => koap-core}/src/commonMain/kotlin/Constants.kt | 0 {koap => koap-core}/src/commonMain/kotlin/Debug.kt | 0 {koap => koap-core}/src/commonMain/kotlin/Decoder.kt | 0 {koap => koap-core}/src/commonMain/kotlin/Encoder.kt | 0 {koap => koap-core}/src/commonMain/kotlin/Header.kt | 0 {koap => koap-core}/src/commonMain/kotlin/Message.kt | 0 {koap => koap-core}/src/commonMain/kotlin/ToFormat.kt | 0 .../src/commonTest/kotlin/ByteArrayReaderTest.kt | 0 {koap => koap-core}/src/commonTest/kotlin/DecoderTest.kt | 0 {koap => koap-core}/src/commonTest/kotlin/EncoderTest.kt | 0 {koap => koap-core}/src/commonTest/kotlin/MessageTest.kt | 0 {koap => koap-core}/src/jvmTest/kotlin/JvmMessageTest.kt | 0 koap/gradle.properties | 1 - settings.gradle.kts | 4 +++- webapp/build.gradle.kts | 2 +- 20 files changed, 8 insertions(+), 6 deletions(-) rename koap/api/koap.api => koap-core/api/koap-core.api (100%) rename {koap => koap-core}/build.gradle.kts (100%) rename {koap => koap-core}/src/commonMain/kotlin/ByteArrayReader.kt (100%) rename {koap => koap-core}/src/commonMain/kotlin/Constants.kt (100%) rename {koap => koap-core}/src/commonMain/kotlin/Debug.kt (100%) rename {koap => koap-core}/src/commonMain/kotlin/Decoder.kt (100%) rename {koap => koap-core}/src/commonMain/kotlin/Encoder.kt (100%) rename {koap => koap-core}/src/commonMain/kotlin/Header.kt (100%) rename {koap => koap-core}/src/commonMain/kotlin/Message.kt (100%) rename {koap => koap-core}/src/commonMain/kotlin/ToFormat.kt (100%) rename {koap => koap-core}/src/commonTest/kotlin/ByteArrayReaderTest.kt (100%) rename {koap => koap-core}/src/commonTest/kotlin/DecoderTest.kt (100%) rename {koap => koap-core}/src/commonTest/kotlin/EncoderTest.kt (100%) rename {koap => koap-core}/src/commonTest/kotlin/MessageTest.kt (100%) rename {koap => koap-core}/src/jvmTest/kotlin/JvmMessageTest.kt (100%) delete mode 100644 koap/gradle.properties diff --git a/build.gradle.kts b/build.gradle.kts index 43c64066..9759b5b5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,6 +15,8 @@ plugins { } allprojects { + group = "com.juul.koap" + repositories { mavenCentral() maven(url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") @@ -71,7 +73,7 @@ task("assembleGitHubPages") { description = "Generates static web site for GitHub Pages." group = "Build" - dependsOn(":webapp:browserDistribution", ":koap:dokkaHtml") + dependsOn(":webapp:browserDistribution", ":koap-core:dokkaHtml") into("$buildDir/gh-pages") from("${project(":webapp").buildDir}/dist/js/productionExecutable") { @@ -79,7 +81,7 @@ task("assembleGitHubPages") { } into("docs") { - from("${project(":koap").buildDir}/dokka/html") { + from("${project(":koap-core").buildDir}/dokka/html") { include("**") } } diff --git a/gradle.properties b/gradle.properties index a64ce77a..a463518d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,6 @@ SONATYPE_HOST=DEFAULT SONATYPE_AUTOMATIC_RELEASE=true RELEASE_SIGNING_ENABLED=true -GROUP=com.juul.koap VERSION_NAME=unspecified POM_NAME=KoAP diff --git a/koap/api/koap.api b/koap-core/api/koap-core.api similarity index 100% rename from koap/api/koap.api rename to koap-core/api/koap-core.api diff --git a/koap/build.gradle.kts b/koap-core/build.gradle.kts similarity index 100% rename from koap/build.gradle.kts rename to koap-core/build.gradle.kts diff --git a/koap/src/commonMain/kotlin/ByteArrayReader.kt b/koap-core/src/commonMain/kotlin/ByteArrayReader.kt similarity index 100% rename from koap/src/commonMain/kotlin/ByteArrayReader.kt rename to koap-core/src/commonMain/kotlin/ByteArrayReader.kt diff --git a/koap/src/commonMain/kotlin/Constants.kt b/koap-core/src/commonMain/kotlin/Constants.kt similarity index 100% rename from koap/src/commonMain/kotlin/Constants.kt rename to koap-core/src/commonMain/kotlin/Constants.kt diff --git a/koap/src/commonMain/kotlin/Debug.kt b/koap-core/src/commonMain/kotlin/Debug.kt similarity index 100% rename from koap/src/commonMain/kotlin/Debug.kt rename to koap-core/src/commonMain/kotlin/Debug.kt diff --git a/koap/src/commonMain/kotlin/Decoder.kt b/koap-core/src/commonMain/kotlin/Decoder.kt similarity index 100% rename from koap/src/commonMain/kotlin/Decoder.kt rename to koap-core/src/commonMain/kotlin/Decoder.kt diff --git a/koap/src/commonMain/kotlin/Encoder.kt b/koap-core/src/commonMain/kotlin/Encoder.kt similarity index 100% rename from koap/src/commonMain/kotlin/Encoder.kt rename to koap-core/src/commonMain/kotlin/Encoder.kt diff --git a/koap/src/commonMain/kotlin/Header.kt b/koap-core/src/commonMain/kotlin/Header.kt similarity index 100% rename from koap/src/commonMain/kotlin/Header.kt rename to koap-core/src/commonMain/kotlin/Header.kt diff --git a/koap/src/commonMain/kotlin/Message.kt b/koap-core/src/commonMain/kotlin/Message.kt similarity index 100% rename from koap/src/commonMain/kotlin/Message.kt rename to koap-core/src/commonMain/kotlin/Message.kt diff --git a/koap/src/commonMain/kotlin/ToFormat.kt b/koap-core/src/commonMain/kotlin/ToFormat.kt similarity index 100% rename from koap/src/commonMain/kotlin/ToFormat.kt rename to koap-core/src/commonMain/kotlin/ToFormat.kt diff --git a/koap/src/commonTest/kotlin/ByteArrayReaderTest.kt b/koap-core/src/commonTest/kotlin/ByteArrayReaderTest.kt similarity index 100% rename from koap/src/commonTest/kotlin/ByteArrayReaderTest.kt rename to koap-core/src/commonTest/kotlin/ByteArrayReaderTest.kt diff --git a/koap/src/commonTest/kotlin/DecoderTest.kt b/koap-core/src/commonTest/kotlin/DecoderTest.kt similarity index 100% rename from koap/src/commonTest/kotlin/DecoderTest.kt rename to koap-core/src/commonTest/kotlin/DecoderTest.kt diff --git a/koap/src/commonTest/kotlin/EncoderTest.kt b/koap-core/src/commonTest/kotlin/EncoderTest.kt similarity index 100% rename from koap/src/commonTest/kotlin/EncoderTest.kt rename to koap-core/src/commonTest/kotlin/EncoderTest.kt diff --git a/koap/src/commonTest/kotlin/MessageTest.kt b/koap-core/src/commonTest/kotlin/MessageTest.kt similarity index 100% rename from koap/src/commonTest/kotlin/MessageTest.kt rename to koap-core/src/commonTest/kotlin/MessageTest.kt diff --git a/koap/src/jvmTest/kotlin/JvmMessageTest.kt b/koap-core/src/jvmTest/kotlin/JvmMessageTest.kt similarity index 100% rename from koap/src/jvmTest/kotlin/JvmMessageTest.kt rename to koap-core/src/jvmTest/kotlin/JvmMessageTest.kt diff --git a/koap/gradle.properties b/koap/gradle.properties deleted file mode 100644 index 6a0afc1f..00000000 --- a/koap/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=koap diff --git a/settings.gradle.kts b/settings.gradle.kts index 226cd3e1..01bee375 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,5 @@ +rootProject.name = "koap" + pluginManagement { repositories { gradlePluginPortal() @@ -5,6 +7,6 @@ pluginManagement { } include( - ":koap", + ":koap-core", ":webapp", ) diff --git a/webapp/build.gradle.kts b/webapp/build.gradle.kts index 1e89b172..fc96bc21 100644 --- a/webapp/build.gradle.kts +++ b/webapp/build.gradle.kts @@ -12,7 +12,7 @@ kotlin { sourceSets { val main by getting { dependencies { - implementation(project(":koap")) + implementation(project(":koap-core")) implementation(libs.kotlinx.coroutines.js) implementation(libs.kotlinx.serialization.json) implementation(libs.okio.js)