diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml index a8c221dc6..1bd0a15a4 100644 --- a/.github/workflows/ci_examples_java.yml +++ b/.github/workflows/ci_examples_java.yml @@ -84,7 +84,7 @@ jobs: - name: Build and locally deploy dependencies for examples shell: bash - working-directory: ./DynamoDbEncryption + working-directory: ./submodules/MaterialProviders/AwsCryptographicMaterialProviders run: | # This works because `node` is installed by default on GHA runners CORES=$(node -e 'console.log(os.cpus().length)') @@ -96,7 +96,4 @@ jobs: working-directory: ./Examples run: | # Run simple examples - gradle -p runtimes/java/DynamoDbEncryption test - # Run migration examples - gradle -p runtimes/java/Migration/PlaintextToAWSDBE test - gradle -p runtimes/java/Migration/DDBECToAWSDBE test + gradle -p runtimes/java/DynamoDbEncryption test \ No newline at end of file diff --git a/.github/workflows/ci_examples_net.yml b/.github/workflows/ci_examples_net.yml index f9d85e050..9ccc44f44 100644 --- a/.github/workflows/ci_examples_net.yml +++ b/.github/workflows/ci_examples_net.yml @@ -84,7 +84,7 @@ jobs: - name: Compile ${{ matrix.library }} implementation shell: bash - working-directory: ./${{ matrix.library }} + working-directory: ./submodules/MaterialProviders/AwsCryptographicMaterialProviders run: | # This works because `node` is installed by default on GHA runners CORES=$(node -e 'console.log(os.cpus().length)') diff --git a/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts b/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts index bcf62436d..df1cf23ce 100644 --- a/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts +++ b/Examples/runtimes/java/DynamoDbEncryption/build.gradle.kts @@ -67,8 +67,8 @@ repositories { } dependencies { - implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}") - implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}") + implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:3.9.0") + implementation("software.amazon.cryptography:aws-cryptographic-material-providers:1.11.1-SNAPSHOT") implementation(platform("software.amazon.awssdk:bom:2.19.1")) implementation("software.amazon.awssdk:arns") diff --git a/Examples/runtimes/net/Examples.csproj b/Examples/runtimes/net/Examples.csproj index 573a10eb6..9c342ecc5 100644 --- a/Examples/runtimes/net/Examples.csproj +++ b/Examples/runtimes/net/Examples.csproj @@ -9,7 +9,8 @@ - + + diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 952c42f1c..89d3e89cf 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 952c42f1c7cfad57cc9ea0115c2a0cb38164ead7 +Subproject commit 89d3e89cf521049a80beef4418122e9461d14455