From b265bc94b6f0bfc7bbc5ed14529ca44a526aa9c4 Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 19 Oct 2023 10:44:35 -0700 Subject: [PATCH 1/5] chore: Consolidate tasks * Update the root Makefile to run for each library * Add format and codegen targets to root Makefile * Add java and net format/check targets * Update format action to prepare for update --- ...ry_dafny_format.yml => library_format.yml} | 21 ++++++- AwsCryptographicMaterialProviders/Makefile | 2 - .../runtimes/java/build.gradle.kts | 7 +++ .../runtimes/java/build.gradle.kts | 7 +++ .../runtimes/java/build.gradle.kts | 7 +++ .../runtimes/java/build.gradle.kts | 7 +++ Makefile | 56 ++++++++++++------- SharedMakefileV2.mk | 19 ++++++- .../runtimes/java/build.gradle.kts | 7 +++ .../Makefile | 3 - .../runtimes/java/build.gradle.kts | 7 +++ 11 files changed, 113 insertions(+), 30 deletions(-) rename .github/workflows/{library_dafny_format.yml => library_format.yml} (66%) diff --git a/.github/workflows/library_dafny_format.yml b/.github/workflows/library_format.yml similarity index 66% rename from .github/workflows/library_dafny_format.yml rename to .github/workflows/library_format.yml index 0278e9732..7142ad37b 100644 --- a/.github/workflows/library_dafny_format.yml +++ b/.github/workflows/library_format.yml @@ -1,5 +1,5 @@ # This workflow performs static analysis checks. -name: Library Dafny format check +name: Library format check on: workflow_call: @@ -49,4 +49,21 @@ jobs: run: | # This works because `node` is installed by default on GHA runners CORES=$(node -e 'console.log(os.cpus().length)') - make format-check + make format_dafny-check + + # Commented out until the format has been updated + # - name: Check format of ${{ matrix.library }} Net code + # shell: bash + # working-directory: ./${{ matrix.library }} + # run: | + # # This works because `node` is installed by default on GHA runners + # CORES=$(node -e 'console.log(os.cpus().length)') + # make format_net-check + + # - name: Check format of ${{ matrix.library }} Java code + # shell: bash + # working-directory: ./${{ matrix.library }} + # run: | + # # This works because `node` is installed by default on GHA runners + # CORES=$(node -e 'console.log(os.cpus().length)') + # make format_java-check diff --git a/AwsCryptographicMaterialProviders/Makefile b/AwsCryptographicMaterialProviders/Makefile index 9989e303b..cdedf1dc8 100644 --- a/AwsCryptographicMaterialProviders/Makefile +++ b/AwsCryptographicMaterialProviders/Makefile @@ -44,5 +44,3 @@ SERVICE_DEPS_AwsCryptographyKeyStore := \ ComAmazonawsDynamodb \ AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders \ -format_net: - pushd runtimes/net && dotnet format && popd diff --git a/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index f526a3cce..da1c5f107 100644 --- a/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -7,6 +7,7 @@ plugins { `signing` id("com.github.johnrengelman.shadow") version "7.1.2" id("io.github.gradle-nexus.publish-plugin") version "1.3.0" + id("com.diffplug.spotless") version "6.22.0" } group = "software.amazon.cryptography" @@ -307,3 +308,9 @@ fun buildPom(mavenPublication: MavenPublication) { } } } + +spotless { + java { + googleJavaFormat() + } +} diff --git a/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts b/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts index 85f365f54..1c83ddd55 100644 --- a/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts +++ b/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts @@ -4,6 +4,7 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` + id("com.diffplug.spotless") version "6.22.0" } group = "software.amazon.cryptography" @@ -82,3 +83,9 @@ tasks { classpath = sourceSets["test"].runtimeClasspath } } + +spotless { + java { + googleJavaFormat() + } +} diff --git a/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts b/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts index 90fb875dd..c403b2abe 100644 --- a/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts +++ b/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts @@ -4,6 +4,7 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` + id("com.diffplug.spotless") version "6.22.0" } group = "software.amazon.cryptography" @@ -87,3 +88,9 @@ tasks { classpath = sourceSets["test"].runtimeClasspath } } + +spotless { + java { + googleJavaFormat() + } +} diff --git a/ComAmazonawsKms/runtimes/java/build.gradle.kts b/ComAmazonawsKms/runtimes/java/build.gradle.kts index 3442385a7..914d0504d 100644 --- a/ComAmazonawsKms/runtimes/java/build.gradle.kts +++ b/ComAmazonawsKms/runtimes/java/build.gradle.kts @@ -4,6 +4,7 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` + id("com.diffplug.spotless") version "6.22.0" } group = "software.amazon.cryptography" @@ -87,3 +88,9 @@ tasks { classpath = sourceSets["test"].runtimeClasspath } } + +spotless { + java { + googleJavaFormat() + } +} diff --git a/Makefile b/Makefile index 305f3e5c0..d804fb956 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,44 @@ # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 +# This finds all Dafny projects in this repository +# This makes building root level targets for each project easy +PROJECTS = $(shell find . -mindepth 2 -maxdepth 2 -type f -name "Makefile" | xargs dirname | xargs basename) + verify: - $(MAKE) -C StandardLibrary verify CORES=4 - $(MAKE) -C AwsCryptographyPrimitives verify CORES=4 - $(MAKE) -C ComAmazonawsKms verify CORES=4 - $(MAKE) -C ComAmazonawsDynamodb verify CORES=4 - $(MAKE) -C AwsCryptographicMaterialProviders verify CORES=4 - $(MAKE) -C TestVectorsAwsCryptographicMaterialProviders verify CORES=4 + $(foreach PROJECT, $(PROJECTS), \ + $(MAKE) -C $(PROJECT) verify CORES=4 && \ + ) true dafny-reportgenerator: - $(MAKE) -C StandardLibrary dafny-reportgenerator - $(MAKE) -C AwsCryptographyPrimitives dafny-reportgenerator - $(MAKE) -C ComAmazonawsKms dafny-reportgenerator - $(MAKE) -C ComAmazonawsDynamodb dafny-reportgenerator - $(MAKE) -C AwsCryptographicMaterialProviders dafny-reportgenerator - $(MAKE) -C TestVectorsAwsCryptographicMaterialProviders dafny-reportgenerator + $(foreach PROJECT, $(PROJECTS), \ + $(MAKE) -C $(PROJECT) dafny-reportgenerator && \ + ) true + +clean-dafny-report: + $(foreach PROJECT, $(PROJECTS), \ + $(MAKE) -C $(PROJECT) clean-dafny-report && \ + ) true + +format_dafny: + $(foreach PROJECT, $(PROJECTS), \ + $(MAKE) -C $(PROJECT) format_dafny && \ + ) true + +format_net: + $(foreach PROJECT, $(PROJECTS), \ + $(MAKE) -C $(PROJECT) format_net && \ + ) true + +format_java: + $(foreach PROJECT, $(PROJECTS), \ + $(MAKE) -C $(PROJECT) format_java && \ + ) true + +polymorph_code_gen: + $(foreach PROJECT, $(PROJECTS), \ + $(MAKE) -C $(PROJECT) polymorph_code_gen && \ + ) true duvet: | duvet_extract duvet_report @@ -35,12 +58,3 @@ duvet_report: --source-pattern "AwsCryptographicMaterialProviders/compliance_exceptions/**/*.txt" \ --source-pattern "(# //=,# //#).github/workflows/duvet.yaml" \ --html specification_compliance_report.html - -format: - $(MAKE) -C StandardLibrary format - $(MAKE) -C AwsCryptographyPrimitives format - $(MAKE) -C ComAmazonawsKms format - $(MAKE) -C ComAmazonawsDynamodb format - $(MAKE) -C AwsCryptographicMaterialProviders format - $(MAKE) -C TestVectorsAwsCryptographicMaterialProviders format - diff --git a/SharedMakefileV2.mk b/SharedMakefileV2.mk index 79d352832..66cc4bac1 100644 --- a/SharedMakefileV2.mk +++ b/SharedMakefileV2.mk @@ -123,14 +123,14 @@ verify_service: -trace \ `find ./dafny/$(SERVICE) -name '*.dfy'` \ -format: +format_dafny: dafny format \ --function-syntax 3 \ --quantifier-syntax 3 \ --unicode-char false \ `find . -name '*.dfy'` -format-check: +format_dafny-check: dafny format \ --check \ --function-syntax 3 \ @@ -144,6 +144,9 @@ dafny-reportgenerator: --max-resource-count $(MAX_RESOURCE_COUNT) \ TestResults/*.csv +clean-dafny-report: + rm TestResults/*.csv + # Dafny helper targets # Transpile the entire project's impl @@ -341,11 +344,23 @@ test_net_mac_brew: setup_net: dotnet restore runtimes/net/ +format_net: + dotnet format runtimes/net/*.csproj + +format_net-check: + dotnet format runtimes/net/*.csproj --verify-no-changes + ########################## Java targets build_java: transpile_java mvn_local_deploy_dependencies ./runtimes/java/gradlew -p runtimes/java build +format_java: + ./runtimes/java/gradlew -p runtimes/java spotlessApply + +format_java-check: + ./runtimes/java/gradlew -p runtimes/java spotlessCheck + transpile_java: | transpile_implementation_java transpile_test_java transpile_dependencies_java transpile_implementation_java: TARGET=java diff --git a/StandardLibrary/runtimes/java/build.gradle.kts b/StandardLibrary/runtimes/java/build.gradle.kts index fac1526f7..04eeff071 100644 --- a/StandardLibrary/runtimes/java/build.gradle.kts +++ b/StandardLibrary/runtimes/java/build.gradle.kts @@ -4,6 +4,7 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` + id("com.diffplug.spotless") version "6.22.0" } group = "software.amazon.cryptography" @@ -78,3 +79,9 @@ tasks { classpath = sourceSets["test"].runtimeClasspath } } + +spotless { + java { + googleJavaFormat() + } +} diff --git a/TestVectorsAwsCryptographicMaterialProviders/Makefile b/TestVectorsAwsCryptographicMaterialProviders/Makefile index 5fb6b5332..ee9acc147 100644 --- a/TestVectorsAwsCryptographicMaterialProviders/Makefile +++ b/TestVectorsAwsCryptographicMaterialProviders/Makefile @@ -55,6 +55,3 @@ SERVICE_DEPS_KeyVectors := \ ComAmazonawsDynamodb \ AwsCryptographicMaterialProviders/dafny/AwsCryptographyKeyStore \ AwsCryptographicMaterialProviders/dafny/AwsCryptographicMaterialProviders \ - -format_net: - pushd runtimes/net && dotnet format && popd diff --git a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index c085ce60b..a5c0c1a20 100644 --- a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -8,6 +8,7 @@ tasks.wrapper { plugins { `java-library` `maven-publish` + id("com.diffplug.spotless") version "6.22.0" } group = "software.amazon.cryptography" @@ -94,3 +95,9 @@ tasks.register("copyKeysJSON") { from(layout.projectDirectory.file("../../dafny/TestVectorsAwsCryptographicMaterialProviders/test/keys.json")) into(layout.projectDirectory.dir("dafny/TestVectorsAwsCryptographicMaterialProviders/test")) } + +spotless { + java { + googleJavaFormat() + } +} From ceef39e9b50273785e13e7e6c3ea9bb63a130f41 Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 19 Oct 2023 11:08:31 -0700 Subject: [PATCH 2/5] update --- .github/workflows/manual.yml | 2 +- .github/workflows/pull.yml | 2 +- .github/workflows/push.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 05e966c6c..5b393fe50 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -13,7 +13,7 @@ on: jobs: manual-ci-format: - uses: ./.github/workflows/library_dafny_format.yml + uses: ./.github/workflows/library_format.yml with: dafny: '4.2.0' manual-ci-verification: diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 36853fd18..e4b35f27c 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -6,7 +6,7 @@ on: jobs: pr-ci-format: - uses: ./.github/workflows/library_dafny_format.yml + uses: ./.github/workflows/library_format.yml with: dafny: '4.2.0' pr-ci-verification: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index dbdc38b3a..fb7e84174 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,7 +8,7 @@ on: jobs: push-ci-format: - uses: ./.github/workflows/library_dafny_format.yml + uses: ./.github/workflows/library_format.yml with: dafny: '4.2.0' push-ci-verification: From 7ae9319ca152ec5de47aaa6384110f5b83cd26f9 Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 19 Oct 2023 13:38:14 -0700 Subject: [PATCH 3/5] =?UTF-8?q?don=E2=80=99t=20format=20yet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runtimes/java/build.gradle.kts | 11 ++++++----- .../runtimes/java/build.gradle.kts | 11 ++++++----- ComAmazonawsDynamodb/runtimes/java/build.gradle.kts | 11 ++++++----- ComAmazonawsKms/runtimes/java/build.gradle.kts | 11 ++++++----- StandardLibrary/runtimes/java/build.gradle.kts | 11 ++++++----- .../runtimes/java/build.gradle.kts | 11 ++++++----- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index da1c5f107..e5093a62b 100644 --- a/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -309,8 +309,9 @@ fun buildPom(mavenPublication: MavenPublication) { } } -spotless { - java { - googleJavaFormat() - } -} +// Commented out until the format has been updated +// spotless { +// java { +// googleJavaFormat() +// } +// } \ No newline at end of file diff --git a/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts b/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts index 1c83ddd55..fd9c6f341 100644 --- a/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts +++ b/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts @@ -84,8 +84,9 @@ tasks { } } -spotless { - java { - googleJavaFormat() - } -} +// Commented out until the format has been updated +// spotless { +// java { +// googleJavaFormat() +// } +// } diff --git a/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts b/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts index c403b2abe..56229c544 100644 --- a/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts +++ b/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts @@ -89,8 +89,9 @@ tasks { } } -spotless { - java { - googleJavaFormat() - } -} +// Commented out until the format has been updated +// spotless { +// java { +// googleJavaFormat() +// } +// } diff --git a/ComAmazonawsKms/runtimes/java/build.gradle.kts b/ComAmazonawsKms/runtimes/java/build.gradle.kts index 914d0504d..75190aded 100644 --- a/ComAmazonawsKms/runtimes/java/build.gradle.kts +++ b/ComAmazonawsKms/runtimes/java/build.gradle.kts @@ -89,8 +89,9 @@ tasks { } } -spotless { - java { - googleJavaFormat() - } -} +// Commented out until the format has been updated +// spotless { +// java { +// googleJavaFormat() +// } +// } diff --git a/StandardLibrary/runtimes/java/build.gradle.kts b/StandardLibrary/runtimes/java/build.gradle.kts index 04eeff071..0066c3a60 100644 --- a/StandardLibrary/runtimes/java/build.gradle.kts +++ b/StandardLibrary/runtimes/java/build.gradle.kts @@ -80,8 +80,9 @@ tasks { } } -spotless { - java { - googleJavaFormat() - } -} +// Commented out until the format has been updated +// spotless { +// java { +// googleJavaFormat() +// } +// } diff --git a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index a5c0c1a20..b6e1ad37a 100644 --- a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -96,8 +96,9 @@ tasks.register("copyKeysJSON") { into(layout.projectDirectory.dir("dafny/TestVectorsAwsCryptographicMaterialProviders/test")) } -spotless { - java { - googleJavaFormat() - } -} +// Commented out until the format has been updated +// spotless { +// java { +// googleJavaFormat() +// } +// } From f7f63c5bcb865b5bcedc399e1c759cde10eec806 Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 19 Oct 2023 15:36:11 -0700 Subject: [PATCH 4/5] Spotless takes Java 11 min --- AwsCryptographyPrimitives/runtimes/java/build.gradle.kts | 4 +++- ComAmazonawsDynamodb/runtimes/java/build.gradle.kts | 4 +++- ComAmazonawsKms/runtimes/java/build.gradle.kts | 4 +++- StandardLibrary/runtimes/java/build.gradle.kts | 4 +++- .../runtimes/java/build.gradle.kts | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts b/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts index fd9c6f341..10fca8f8b 100644 --- a/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts +++ b/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts @@ -4,7 +4,9 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` - id("com.diffplug.spotless") version "6.22.0" + if (JavaVersion.current() >= JavaVersion.VERSION_11) { + id("com.diffplug.spotless") version "6.22.0" + } } group = "software.amazon.cryptography" diff --git a/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts b/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts index 56229c544..e4b31b2c4 100644 --- a/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts +++ b/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts @@ -4,7 +4,9 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` - id("com.diffplug.spotless") version "6.22.0" + if (JavaVersion.current() >= JavaVersion.VERSION_11) { + id("com.diffplug.spotless") version "6.22.0" + } } group = "software.amazon.cryptography" diff --git a/ComAmazonawsKms/runtimes/java/build.gradle.kts b/ComAmazonawsKms/runtimes/java/build.gradle.kts index 75190aded..1a3183856 100644 --- a/ComAmazonawsKms/runtimes/java/build.gradle.kts +++ b/ComAmazonawsKms/runtimes/java/build.gradle.kts @@ -4,7 +4,9 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` - id("com.diffplug.spotless") version "6.22.0" + if (JavaVersion.current() >= JavaVersion.VERSION_11) { + id("com.diffplug.spotless") version "6.22.0" + } } group = "software.amazon.cryptography" diff --git a/StandardLibrary/runtimes/java/build.gradle.kts b/StandardLibrary/runtimes/java/build.gradle.kts index 0066c3a60..c39d92d38 100644 --- a/StandardLibrary/runtimes/java/build.gradle.kts +++ b/StandardLibrary/runtimes/java/build.gradle.kts @@ -4,7 +4,9 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` - id("com.diffplug.spotless") version "6.22.0" + if (JavaVersion.current() >= JavaVersion.VERSION_11) { + id("com.diffplug.spotless") version "6.22.0" + } } group = "software.amazon.cryptography" diff --git a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index b6e1ad37a..0bcbdced5 100644 --- a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -8,7 +8,9 @@ tasks.wrapper { plugins { `java-library` `maven-publish` - id("com.diffplug.spotless") version "6.22.0" + if (JavaVersion.current() >= JavaVersion.VERSION_11) { + id("com.diffplug.spotless") version "6.22.0" + } } group = "software.amazon.cryptography" From 836660ce4c779bfe84c36d560ad6b1f4dfd12ef6 Mon Sep 17 00:00:00 2001 From: seebees Date: Thu, 19 Oct 2023 15:55:17 -0700 Subject: [PATCH 5/5] update --- .../runtimes/java/build.gradle.kts | 4 +++- AwsCryptographyPrimitives/runtimes/java/build.gradle.kts | 2 +- ComAmazonawsDynamodb/runtimes/java/build.gradle.kts | 2 +- ComAmazonawsKms/runtimes/java/build.gradle.kts | 2 +- StandardLibrary/runtimes/java/build.gradle.kts | 4 ++-- .../runtimes/java/build.gradle.kts | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index e5093a62b..bfcf2094e 100644 --- a/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/AwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -7,7 +7,9 @@ plugins { `signing` id("com.github.johnrengelman.shadow") version "7.1.2" id("io.github.gradle-nexus.publish-plugin") version "1.3.0" - id("com.diffplug.spotless") version "6.22.0" + if (JavaVersion.current() >= JavaVersion.VERSION_11) { + id("com.diffplug.spotless") version "6.22.0" + } } group = "software.amazon.cryptography" diff --git a/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts b/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts index 10fca8f8b..f8bb34bef 100644 --- a/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts +++ b/AwsCryptographyPrimitives/runtimes/java/build.gradle.kts @@ -4,7 +4,7 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` - if (JavaVersion.current() >= JavaVersion.VERSION_11) { + if (JavaVersion.current() >= JavaVersion.VERSION_11) { id("com.diffplug.spotless") version "6.22.0" } } diff --git a/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts b/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts index e4b31b2c4..c87feeef4 100644 --- a/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts +++ b/ComAmazonawsDynamodb/runtimes/java/build.gradle.kts @@ -4,7 +4,7 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` - if (JavaVersion.current() >= JavaVersion.VERSION_11) { + if (JavaVersion.current() >= JavaVersion.VERSION_11) { id("com.diffplug.spotless") version "6.22.0" } } diff --git a/ComAmazonawsKms/runtimes/java/build.gradle.kts b/ComAmazonawsKms/runtimes/java/build.gradle.kts index 1a3183856..6b6b5bc82 100644 --- a/ComAmazonawsKms/runtimes/java/build.gradle.kts +++ b/ComAmazonawsKms/runtimes/java/build.gradle.kts @@ -4,7 +4,7 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` - if (JavaVersion.current() >= JavaVersion.VERSION_11) { + if (JavaVersion.current() >= JavaVersion.VERSION_11) { id("com.diffplug.spotless") version "6.22.0" } } diff --git a/StandardLibrary/runtimes/java/build.gradle.kts b/StandardLibrary/runtimes/java/build.gradle.kts index c39d92d38..3598b078d 100644 --- a/StandardLibrary/runtimes/java/build.gradle.kts +++ b/StandardLibrary/runtimes/java/build.gradle.kts @@ -4,8 +4,8 @@ import javax.annotation.Nullable plugins { `java-library` `maven-publish` - if (JavaVersion.current() >= JavaVersion.VERSION_11) { - id("com.diffplug.spotless") version "6.22.0" + if (JavaVersion.current() >= JavaVersion.VERSION_11) { + id("com.diffplug.spotless") version "6.22.0" } } diff --git a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts index 0bcbdced5..8358c09e6 100644 --- a/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts +++ b/TestVectorsAwsCryptographicMaterialProviders/runtimes/java/build.gradle.kts @@ -8,7 +8,7 @@ tasks.wrapper { plugins { `java-library` `maven-publish` - if (JavaVersion.current() >= JavaVersion.VERSION_11) { + if (JavaVersion.current() >= JavaVersion.VERSION_11) { id("com.diffplug.spotless") version "6.22.0" } }