From dac2a5c25079946f0c9d7a006f347201e33f7866 Mon Sep 17 00:00:00 2001 From: Andrew Westberg Date: Mon, 18 Mar 2024 18:42:25 +0000 Subject: [PATCH] Updates for latest ogmios --- .github/workflows/ktlint.yml | 2 +- build.gradle.kts | 8 ++++---- buildSrc/src/main/kotlin/Versions.kt | 16 ++++++++-------- .../protocols/model/ConwayConstitution.kt | 8 ++++---- .../model/fault/ScriptExecutionFailureFault.kt | 3 +-- .../ScriptExecutionFailureFaultDataSerializer.kt | 7 +++++-- .../kogmios/protocols/txsubmit/TxSubmitTest.kt | 4 ++-- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ktlint.yml b/.github/workflows/ktlint.yml index 46619df..31fc19f 100644 --- a/.github/workflows/ktlint.yml +++ b/.github/workflows/ktlint.yml @@ -17,7 +17,7 @@ jobs: distribution: 'zulu' java-version: '17' - run: | - curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.1.1/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/ + curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.2.1/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/ - name: run ktlint run: | ktlint --reporter=checkstyle,output=build/ktlint-report.xml diff --git a/build.gradle.kts b/build.gradle.kts index d1e321f..55bcc3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,10 +18,10 @@ if (!project.hasProperty("isGithubActions")) { } group = "io.newm" -version = "2.0.1-SNAPSHOT" +version = "2.1.0-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_17 -java.targetCompatibility = JavaVersion.VERSION_17 +java.sourceCompatibility = JavaVersion.VERSION_21 +java.targetCompatibility = JavaVersion.VERSION_21 repositories { mavenLocal() @@ -190,7 +190,7 @@ tasks.withType { "-opt-in=kotlinx.serialization.ExperimentalSerializationApi", "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", ) - jvmTarget = "17" + jvmTarget = "21" } } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 6768ce7..48e925a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,17 +1,17 @@ object Versions { const val COMMONS_LOGGING = "1.3.0" const val COMMONS_NUMBERS = "1.1" - const val COROUTINES = "1.7.3" - const val GOOGLE_TRUTH = "1.4.0" + const val COROUTINES = "1.8.0" + const val GOOGLE_TRUTH = "1.4.2" const val JUNIT = "5.10.2" - const val KOTLIN = "1.9.22" + const val KOTLIN = "1.9.23" const val KOTLINX_DATETIME = "0.5.0" - const val KOTLINX_SERIALIZATION = "1.6.2" - const val KTLINT = "1.1.1" + const val KOTLINX_SERIALIZATION = "1.6.3" + const val KTLINT = "1.2.1" const val KTLINT_PLUGIN = "12.1.0" - const val KTOR = "2.3.8" - const val LOGBACK = "1.4.14" + const val KTOR = "2.3.9" + const val LOGBACK = "1.5.3" const val MAVEN_REPO_AUTH_PLUGIN = "3.0.4" - const val MOCKK = "1.13.9" + const val MOCKK = "1.13.10" const val VERSIONS_PLUGIN = "0.51.0" } diff --git a/src/main/kotlin/io/newm/kogmios/protocols/model/ConwayConstitution.kt b/src/main/kotlin/io/newm/kogmios/protocols/model/ConwayConstitution.kt index cc94710..ca7b877 100644 --- a/src/main/kotlin/io/newm/kogmios/protocols/model/ConwayConstitution.kt +++ b/src/main/kotlin/io/newm/kogmios/protocols/model/ConwayConstitution.kt @@ -5,8 +5,8 @@ import kotlinx.serialization.Serializable @Serializable data class ConwayConstitution( - @SerialName("hash") - val hash: String? = null, - @SerialName("anchor") - val anchor: AnchorMetadata, + @SerialName("guardrails") + val guardrails: String? = null, + @SerialName("metadata") + val metadata: AnchorMetadata, ) diff --git a/src/main/kotlin/io/newm/kogmios/protocols/model/fault/ScriptExecutionFailureFault.kt b/src/main/kotlin/io/newm/kogmios/protocols/model/fault/ScriptExecutionFailureFault.kt index ca43192..a3edad5 100644 --- a/src/main/kotlin/io/newm/kogmios/protocols/model/fault/ScriptExecutionFailureFault.kt +++ b/src/main/kotlin/io/newm/kogmios/protocols/model/fault/ScriptExecutionFailureFault.kt @@ -19,9 +19,8 @@ data class ScriptExecutionFailureFault( override val data: ScriptExecutionFailureFaultData, ) : Fault - @Serializable(with = ScriptExecutionFailureFaultDataSerializer::class) -class ScriptExecutionFailureFaultData: ArrayList(), FaultData { +class ScriptExecutionFailureFaultData : ArrayList(), FaultData { override fun equals(other: Any?): Boolean { if (this === other) return true if (other !is ScriptExecutionFailureFaultData) return false diff --git a/src/main/kotlin/io/newm/kogmios/protocols/model/serializers/ScriptExecutionFailureFaultDataSerializer.kt b/src/main/kotlin/io/newm/kogmios/protocols/model/serializers/ScriptExecutionFailureFaultDataSerializer.kt index 1250c65..49da426 100644 --- a/src/main/kotlin/io/newm/kogmios/protocols/model/serializers/ScriptExecutionFailureFaultDataSerializer.kt +++ b/src/main/kotlin/io/newm/kogmios/protocols/model/serializers/ScriptExecutionFailureFaultDataSerializer.kt @@ -20,7 +20,10 @@ object ScriptExecutionFailureFaultDataSerializer : KSerializer