Skip to content

Commit 366e6e7

Browse files
chore: Bump MPL dependency to 1.9.0, consolidate project.properties files (#753)
1 parent f4683de commit 366e6e7

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

AwsEncryptionSDK/project.properties

Lines changed: 0 additions & 4 deletions
This file was deleted.

AwsEncryptionSDK/runtimes/java/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ plugins {
1717
}
1818

1919
var props = Properties().apply {
20-
load(FileInputStream(File(rootProject.rootDir, "../../project.properties")))
20+
load(FileInputStream(File(rootProject.rootDir, "../../../project.properties")))
2121
}
22+
var mplVersion = props.getProperty("mplDependencyJavaVersion")
23+
2224
group = "software.amazon.cryptography"
2325
version = "1.0.0-SNAPSHOT"
2426
description = "AwsEncryptionSdk"
@@ -32,7 +34,7 @@ repositories {
3234
dependencies {
3335
implementation("org.dafny:DafnyRuntime:4.9.0")
3436
implementation("software.amazon.smithy.dafny:conversion:0.1")
35-
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.8.0")
37+
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}")
3638

3739
// Use JUnit test framework.
3840
testImplementation("junit:junit:4.13.2")

TestVectors/project.properties

Lines changed: 0 additions & 4 deletions
This file was deleted.

TestVectors/runtimes/java/build.gradle.kts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import java.io.File
2+
import java.io.FileInputStream
3+
import java.util.Properties
4+
15
tasks.wrapper {
26
gradleVersion = "7.6"
37
}
@@ -8,6 +12,11 @@ plugins {
812
`application`
913
}
1014

15+
var props = Properties().apply {
16+
load(FileInputStream(File(rootProject.rootDir, "../../../project.properties")))
17+
}
18+
var mplVersion = props.getProperty("mplDependencyJavaVersion")
19+
1120
group = "software.amazon.cryptography"
1221
version = "1.0.0-SNAPSHOT"
1322
description = "AwsEncryptionSDKJavaTestVectors"
@@ -33,8 +42,8 @@ repositories {
3342
dependencies {
3443
implementation("org.dafny:DafnyRuntime:4.8.0")
3544
implementation("software.amazon.smithy.dafny:conversion:0.1")
36-
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.8.0")
37-
implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:1.8.0-SNAPSHOT")
45+
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}")
46+
implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:${mplVersion}")
3847
implementation("software.amazon.cryptography:aws-encryption-sdk:1.0.0-SNAPSHOT")
3948
implementation("com.amazonaws:aws-encryption-sdk-java:3.0.1")
4049
implementation(platform("software.amazon.awssdk:bom:2.25.1"))

mpl

Submodule mpl updated from b301c6a to 70e5809

project.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
# This file stores the top level dafny version information.
2+
# All elements of the project need to agree on this version.
13
dafnyVersion=4.9.0
24
dafnyVerifyVersion=4.9.0
35
dafnyFormatVersion=4.9.0
46
projectJavaVersion=4.1.0
5-
mplDependencyJavaVersion=1.8.0
7+
mplDependencyJavaVersion=1.9.0-SNAPSHOT
68
dafnyRuntimeJavaVersion=4.9.0
79
smithyDafnyJavaConversionVersion=0.1.1

0 commit comments

Comments
 (0)