build: move core commons to submodule to clean up build

This commit is contained in:
Johannes Frohnmeyer 2023-09-21 19:08:14 +02:00
parent 79d862da6c
commit df1572edbd
Signed by: Johannes
GPG Key ID: E76429612C2929F4
99 changed files with 33 additions and 31 deletions

View File

@ -1,16 +1 @@
plugins {
id("commons.library")
}
version = "1.4-SNAPSHOT"
publishing {
publications {
create<MavenPublication>("maven") {
groupId = "io.gitlab.jfronny"
artifactId = "commons"
from(components["java"])
}
}
}
version = "1.4-SNAPSHOT"

View File

@ -9,6 +9,6 @@ repositories {
}
dependencies {
implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.0.15")
implementation("io.gitlab.jfronny:convention:1.3-SNAPSHOT")
}
implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.1.0")
implementation("io.gitlab.jfronny:convention:1.5-SNAPSHOT")
}

View File

@ -28,7 +28,7 @@ tasks.compileKotlin {
tasks.javadoc {
enabled = false
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":commons"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-gson/$version/raw", project(":commons-gson"))
//TODO link gson javadoc (harder to generate than expected)
}

View File

@ -6,7 +6,7 @@ plugins {
dependencies {
api("io.gitlab.jfronny:gson:2.10.3-SNAPSHOT")
implementation(project(":"))
implementation(project(":commons"))
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
@ -24,6 +24,6 @@ publishing {
}
tasks.javadoc {
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":commons"))
//TODO link gson javadoc (harder to generate than expected)
}

View File

@ -6,7 +6,7 @@ plugins {
}
dependencies {
implementation(project(":"))
implementation(project(":commons"))
}
publishing {
@ -27,5 +27,5 @@ tasks.jar {
}
tasks.javadoc {
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":commons"))
}

View File

@ -6,7 +6,7 @@ plugins {
dependencies {
implementation("org.slf4j:slf4j-api:2.0.7")
implementation(project(":"))
implementation(project(":commons"))
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
@ -24,6 +24,6 @@ publishing {
}
tasks.javadoc {
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":commons"))
opts.links("https://www.slf4j.org/apidocs")
}

16
commons/build.gradle.kts Normal file
View File

@ -0,0 +1,16 @@
import io.gitlab.jfronny.scripts.*
plugins {
id("commons.library")
}
publishing {
publications {
create<MavenPublication>("maven") {
groupId = "io.gitlab.jfronny"
artifactId = "commons-gson"
from(components["java"])
}
}
}

View File

@ -24,7 +24,7 @@ publishing {
}
tasks.javadoc {
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":commons"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons-gson/$version/raw", project(":commons-gson"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/muscript-gson/$version/raw", project(":muscript"))
}

View File

@ -20,14 +20,14 @@ class JsonTest {
void simpleSerialize() {
assertEquals("\"Yes\"", serialize(of("Yes")));
assertEquals("{\"key\":3}", serialize(of(Map.of("key", of(3)))));
assertEquals("[true,12,\"7\"]", serialize(of(of(true), of(12), of(7).asString())));
assertEquals("[true,12,7]", serialize(of(of(true), of(12), of(7).asString()))); // string lens ignored
}
@Test
void simpleDeserialize() {
assertEquals(of("Yes"), deserialize("\"Yes\"", Dynamic.class));
assertEquals(of(Map.of("key", of(3))), deserialize("{\"key\":3}", Dynamic.class));
assertEquals(of(of(true), of(12), of(7).asString()), deserialize("[true,12,\"7\"]", Dynamic.class));
assertEquals(of(of(true), of(12), of("7")), deserialize("[true,12,\"7\"]", Dynamic.class));
}
@Test

View File

@ -5,7 +5,7 @@ plugins {
}
dependencies {
implementation(project(":"))
implementation(project(":commons"))
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
@ -23,5 +23,5 @@ publishing {
}
tasks.javadoc {
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":"))
linksOffline("https://maven.frohnmeyer-wds.de/javadoc/artifacts/io/gitlab/jfronny/commons/$version/raw", project(":commons"))
}

View File

@ -1,5 +1,6 @@
rootProject.name = "Commons"
include("commons")
include("commons-gson")
include("commons-gson-dsl")
include("commons-jlhttp")