diff --git a/.releaserc.cjs b/.releaserc.cjs index 8f1df27fb1..888025df79 100644 --- a/.releaserc.cjs +++ b/.releaserc.cjs @@ -103,27 +103,6 @@ module.exports = { "semantic-release-replace-plugin", { replacements: [ - // Update the version for all Gradle Java projects - // Does not update the dependencies - { - files: Object.keys(Runtimes.java), - from: 'version = ".*"', - to: 'version = "${nextRelease.version}"', - results: Object.keys(Runtimes.java).map(CheckResults), - countMatches: true, - }, - // Now update the Gradle Java dependencies - ...Object.entries(Runtimes.java).flatMap(([file, { dependencies }]) => - dependencies.map((dependency) => ({ - files: [file], - from: `implementation("${dependency}:.*")`, - to: - `implementation("${dependency}:` + '${nextRelease.version}" />', - results: [CheckResults(file)], - countMatches: true, - })), - ), - // Update the version for all DotNet projects // Does not update the dependencies { @@ -211,8 +190,8 @@ function CheckDependencyReplacementResults(file) { return { file, hasChanged: true, - numMatches: 4, - numReplacements: 4, + numMatches: 3, + numReplacements: 3, }; } else if (file.includes("StandardLibrary")) { return { diff --git a/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index b2723a7f89..f726e8e1b4 100644 --- a/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -18,7 +18,7 @@ var props = Properties().apply { var dafnyVersion = props.getProperty("dafnyVersion") group = "software.amazon.cryptography" -version = "1.8.0-SNAPSHOT" +version = props.getProperty("mplVersion") description = "AWS Cryptographic Material Providers Library" java { @@ -224,18 +224,18 @@ tasks.test { // This will show System.out.println statements testLogging.showStandardStreams = true - testLogging { - lifecycle { - events = mutableSetOf(org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED, org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED, org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED) - exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL - showExceptions = true - showCauses = true - showStackTraces = true - showStandardStreams = true - } - info.events = lifecycle.events - info.exceptionFormat = lifecycle.exceptionFormat - } + // testLogging { + // lifecycle { + // events = mutableSetOf(org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED, org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED, org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED) + // exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL + // showExceptions = true + // showCauses = true + // showStackTraces = true + // showStandardStreams = true + // } + // info.events = lifecycle.events + // info.exceptionFormat = lifecycle.exceptionFormat + // } // See https://github.com/gradle/kotlin-dsl/issues/836 addTestListener(object : TestListener { diff --git a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index 86373d30dd..a576a03895 100644 --- a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -20,7 +20,7 @@ var props = Properties().apply { var dafnyVersion = props.getProperty("dafnyVersion") group = "software.amazon.cryptography" -version = "1.8.0-SNAPSHOT" +version = props.getProperty("mplVersion") description = "TestAwsCryptographicMaterialProviders" java { @@ -68,7 +68,7 @@ repositories { dependencies { implementation("org.dafny:DafnyRuntime:${dafnyVersion}") implementation("software.amazon.smithy.dafny:conversion:0.1.1") - implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.8.0-SNAPSHOT") + implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${version}") implementation(platform("software.amazon.awssdk:bom:2.25.1")) implementation("software.amazon.awssdk:dynamodb") implementation("software.amazon.awssdk:dynamodb-enhanced") diff --git a/project.properties b/project.properties index 37c8a94d43..11a3c4fe45 100644 --- a/project.properties +++ b/project.properties @@ -7,4 +7,4 @@ # And the Dotnet projects include and parse this file. dafnyVersion=4.9.0 dafnyVerifyVersion=4.9.0 -mplVersion=1.8.0-SNAPSHOT +mplVersion=1.9.0-rc