diff --git a/build.gradle.kts b/build.gradle.kts index 3f159ac..ed5bd87 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,9 +15,9 @@ plugins { id("java-library") - id("org.openjfx.javafxplugin") version "0.0.13" + id("org.openjfx.javafxplugin") version "0.0.14" id("maven-publish") - id("io.github.gradle-nexus.publish-plugin") version "1.2.0" + id("io.github.gradle-nexus.publish-plugin") version "1.3.0" signing jacoco } @@ -44,11 +44,11 @@ repositories { } dependencies { - api("com.squareup.moshi:moshi:1.14.0") - compileOnlyApi("org.jetbrains:annotations:24.0.0") + api("com.squareup.moshi:moshi:1.15.0") + compileOnlyApi("org.jetbrains:annotations:24.0.1") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0") } tasks.withType { diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 49a695b..d5b175b 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,5 +1,5 @@ module io.github.danygold.fx.moshi { - requires moshi; + requires com.squareup.moshi; requires transitive javafx.base; requires static org.jetbrains.annotations; @@ -9,9 +9,9 @@ exports io.github.danygold.fxmoshi.adapters.observable; exports io.github.danygold.fxmoshi.factories; - opens io.github.danygold.fxmoshi to moshi; - opens io.github.danygold.fxmoshi.adapters.properties to moshi; - opens io.github.danygold.fxmoshi.adapters.properties.primitives to moshi; - opens io.github.danygold.fxmoshi.adapters.observable to moshi; - opens io.github.danygold.fxmoshi.factories to moshi; + opens io.github.danygold.fxmoshi to com.squareup.moshi; + opens io.github.danygold.fxmoshi.adapters.properties to com.squareup.moshi; + opens io.github.danygold.fxmoshi.adapters.properties.primitives to com.squareup.moshi; + opens io.github.danygold.fxmoshi.adapters.observable to com.squareup.moshi; + opens io.github.danygold.fxmoshi.factories to com.squareup.moshi; } \ No newline at end of file