Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Bump MPL dependency to 1.9.0, consolidate project.properties files #753

Merged
merged 8 commits into from
Feb 6, 2025
Merged

chore: Bump MPL dependency to 1.9.0, consolidate project.properties files #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
934ce0c
chore: Bump MPL dependency to 1.9.0
lucasmcdonald3 Feb 5, 2025
aa75ed0
m
lucasmcdonald3 Feb 5, 2025
e1720ce
m
lucasmcdonald3 Feb 5, 2025
c46c533
m
lucasmcdonald3 Feb 5, 2025
96655bf
m
lucasmcdonald3 Feb 5, 2025
fbdb8ba
m
lucasmcdonald3 Feb 5, 2025
f2fc0a3
m
lucasmcdonald3 Feb 5, 2025
e909615
consolidate
lucasmcdonald3 Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions AwsEncryptionSDK/project.properties
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions AwsEncryptionSDK/runtimes/java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ plugins {
}

var props = Properties().apply {
load(FileInputStream(File(rootProject.rootDir, "../../project.properties")))
load(FileInputStream(File(rootProject.rootDir, "../../../project.properties")))
}
var mplVersion = props.getProperty("mplDependencyJavaVersion")

group = "software.amazon.cryptography"
version = "1.0.0-SNAPSHOT"
description = "AwsEncryptionSdk"
Expand All @@ -32,7 +34,7 @@ repositories {
dependencies {
implementation("org.dafny:DafnyRuntime:4.9.0")
implementation("software.amazon.smithy.dafny:conversion:0.1")
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.8.0")
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}")

// Use JUnit test framework.
testImplementation("junit:junit:4.13.2")
Expand Down
4 changes: 0 additions & 4 deletions TestVectors/project.properties
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions TestVectors/runtimes/java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import java.io.File
import java.io.FileInputStream
import java.util.Properties

tasks.wrapper {
gradleVersion = "7.6"
}
Expand All @@ -8,6 +12,11 @@ plugins {
`application`
}

var props = Properties().apply {
load(FileInputStream(File(rootProject.rootDir, "../../../project.properties")))
}
var mplVersion = props.getProperty("mplDependencyJavaVersion")

group = "software.amazon.cryptography"
version = "1.0.0-SNAPSHOT"
description = "AwsEncryptionSDKJavaTestVectors"
Expand All @@ -33,8 +42,8 @@ repositories {
dependencies {
implementation("org.dafny:DafnyRuntime:4.8.0")
implementation("software.amazon.smithy.dafny:conversion:0.1")
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.8.0")
implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:1.8.0-SNAPSHOT")
implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}")
implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:${mplVersion}")
implementation("software.amazon.cryptography:aws-encryption-sdk:1.0.0-SNAPSHOT")
implementation("com.amazonaws:aws-encryption-sdk-java:3.0.1")
implementation(platform("software.amazon.awssdk:bom:2.25.1"))
Expand Down
2 changes: 1 addition & 1 deletion mpl
Open in desktop
Submodule mpl updated from b301c6 to 70e580
4 changes: 3 additions & 1 deletion project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# This file stores the top level dafny version information.
# All elements of the project need to agree on this version.
dafnyVersion=4.9.0
dafnyVerifyVersion=4.9.0
dafnyFormatVersion=4.9.0
projectJavaVersion=4.1.0
mplDependencyJavaVersion=1.8.0
mplDependencyJavaVersion=1.9.0-SNAPSHOT
dafnyRuntimeJavaVersion=4.9.0
smithyDafnyJavaConversionVersion=0.1.1
Loading