diff --git a/build.sbt b/build.sbt index d41ba47b4..638b82e63 100644 --- a/build.sbt +++ b/build.sbt @@ -935,8 +935,8 @@ lazy val bootstrapped = projectMatrix .in(file("modules/bootstrapped")) .dependsOn(cats, `aws-kernel`, complianceTests) .disablePlugins(ScalafixPlugin) - .disablePlugins(HeaderPlugin) .settings( + Compile / headerSources := Nil, // Setting ScalaPB to generate Scala code from proto files generated by // smithy4s Compile / PB.generate := { @@ -1301,7 +1301,7 @@ def genSmithyImpl(config: Configuration) = Def.task { addCommandAlias( "ci", - "versionDump; clean; scalafmtCheckAll; headerCheck; test; publishLocal; scripted" + "versionDump; clean; scalafmtCheckAll; headerCheckAll; test; publishLocal; scripted" ) addCommandAlias( diff --git a/flake.nix b/flake.nix index f97941baa..b6934e4e0 100644 --- a/flake.nix +++ b/flake.nix @@ -7,10 +7,10 @@ let pkgs = import nixpkgs { inherit system; }; shellPackages = with pkgs; [ - temurin-jre-bin-17 + temurin-bin-17 nodejs-18_x yarn - (pkgs.sbt.override { jre = pkgs.temurin-jre-bin-17; }) + (pkgs.sbt.override { jre = pkgs.temurin-bin-17; }) ]; protobuf = pkgs.protobuf3_21; in diff --git a/modules/bootstrapped/test/src-js/smithy4s/JsConvertersSpec.scala b/modules/bootstrapped/test/src-js/smithy4s/JsConvertersSpec.scala index db6ff2eb0..ab906c8be 100644 --- a/modules/bootstrapped/test/src-js/smithy4s/JsConvertersSpec.scala +++ b/modules/bootstrapped/test/src-js/smithy4s/JsConvertersSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src-js/smithy4s/Platform.scala b/modules/bootstrapped/test/src-js/smithy4s/Platform.scala index 788327e09..ee918afc8 100644 --- a/modules/bootstrapped/test/src-js/smithy4s/Platform.scala +++ b/modules/bootstrapped/test/src-js/smithy4s/Platform.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src-js/smithy4s/TimestampSpec.scala b/modules/bootstrapped/test/src-js/smithy4s/TimestampSpec.scala index 010041363..66d2764cc 100644 --- a/modules/bootstrapped/test/src-js/smithy4s/TimestampSpec.scala +++ b/modules/bootstrapped/test/src-js/smithy4s/TimestampSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src-jvm/smithy4s/Platform.scala b/modules/bootstrapped/test/src-jvm/smithy4s/Platform.scala index accc8ba2e..6c4de165a 100644 --- a/modules/bootstrapped/test/src-jvm/smithy4s/Platform.scala +++ b/modules/bootstrapped/test/src-jvm/smithy4s/Platform.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src-jvm/smithy4s/TimestampSpec.scala b/modules/bootstrapped/test/src-jvm/smithy4s/TimestampSpec.scala index f0b928627..9bdbf4ed9 100644 --- a/modules/bootstrapped/test/src-jvm/smithy4s/TimestampSpec.scala +++ b/modules/bootstrapped/test/src-jvm/smithy4s/TimestampSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src-native/smithy4s/Platform.scala b/modules/bootstrapped/test/src-native/smithy4s/Platform.scala index 517ac540b..c9b62371c 100644 --- a/modules/bootstrapped/test/src-native/smithy4s/Platform.scala +++ b/modules/bootstrapped/test/src-native/smithy4s/Platform.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/AdtSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/AdtSmokeSpec.scala index 38f09f043..8ac4031c9 100644 --- a/modules/bootstrapped/test/src/smithy4s/AdtSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/AdtSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/BigStructSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/BigStructSmokeSpec.scala index 09ca05ee3..3615ba6a3 100644 --- a/modules/bootstrapped/test/src/smithy4s/BigStructSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/BigStructSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/BlobSpec.scala b/modules/bootstrapped/test/src/smithy4s/BlobSpec.scala index a320e2639..189a96051 100644 --- a/modules/bootstrapped/test/src/smithy4s/BlobSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/BlobSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/CachedSchemaVisitorSpec.scala b/modules/bootstrapped/test/src/smithy4s/CachedSchemaVisitorSpec.scala index 64679e463..b292d74fb 100644 --- a/modules/bootstrapped/test/src/smithy4s/CachedSchemaVisitorSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/CachedSchemaVisitorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/CollectionInTraitsSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/CollectionInTraitsSmokeSpec.scala index 1240e6179..33eb06c3c 100644 --- a/modules/bootstrapped/test/src/smithy4s/CollectionInTraitsSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/CollectionInTraitsSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/CollectionMemberTraitsSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/CollectionMemberTraitsSmokeSpec.scala index eb0afc942..336b29651 100644 --- a/modules/bootstrapped/test/src/smithy4s/CollectionMemberTraitsSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/CollectionMemberTraitsSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ConstraintsSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/ConstraintsSmokeSpec.scala index 40732e332..5001545e0 100644 --- a/modules/bootstrapped/test/src/smithy4s/ConstraintsSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ConstraintsSmokeSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/DefaultSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/DefaultSmokeSpec.scala index 85beed380..8909d7073 100644 --- a/modules/bootstrapped/test/src/smithy4s/DefaultSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/DefaultSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/DocumentSpec.scala b/modules/bootstrapped/test/src/smithy4s/DocumentSpec.scala index c1b96fecf..941931de7 100644 --- a/modules/bootstrapped/test/src/smithy4s/DocumentSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/DocumentSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/EmptyServiceSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/EmptyServiceSmokeSpec.scala index 3bd99a256..73e912f72 100644 --- a/modules/bootstrapped/test/src/smithy4s/EmptyServiceSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/EmptyServiceSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/EnumWithSymbolsSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/EnumWithSymbolsSmokeSpec.scala index 9d5cbc454..244d10aa1 100644 --- a/modules/bootstrapped/test/src/smithy4s/EnumWithSymbolsSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/EnumWithSymbolsSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ErrorMessageTraitSpec.scala b/modules/bootstrapped/test/src/smithy4s/ErrorMessageTraitSpec.scala index 25c1ae100..378e6b049 100644 --- a/modules/bootstrapped/test/src/smithy4s/ErrorMessageTraitSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ErrorMessageTraitSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/HandlerSpec.scala b/modules/bootstrapped/test/src/smithy4s/HandlerSpec.scala index e434a5e83..527518651 100644 --- a/modules/bootstrapped/test/src/smithy4s/HandlerSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/HandlerSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s.other import munit.FunSuite diff --git a/modules/bootstrapped/test/src/smithy4s/HintMaskSpec.scala b/modules/bootstrapped/test/src/smithy4s/HintMaskSpec.scala index d94bad721..876a34620 100644 --- a/modules/bootstrapped/test/src/smithy4s/HintMaskSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/HintMaskSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/HintsEqualitySpec.scala b/modules/bootstrapped/test/src/smithy4s/HintsEqualitySpec.scala index 94b910012..3beed59ef 100644 --- a/modules/bootstrapped/test/src/smithy4s/HintsEqualitySpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/HintsEqualitySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/HintsSpec.scala b/modules/bootstrapped/test/src/smithy4s/HintsSpec.scala index 4c025aa05..f21b35d99 100644 --- a/modules/bootstrapped/test/src/smithy4s/HintsSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/HintsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/IntEnumSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/IntEnumSmokeSpec.scala index 73d178c9a..20073d563 100644 --- a/modules/bootstrapped/test/src/smithy4s/IntEnumSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/IntEnumSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/NewtypesSpec.scala b/modules/bootstrapped/test/src/smithy4s/NewtypesSpec.scala index 14589bb6a..0938c4582 100644 --- a/modules/bootstrapped/test/src/smithy4s/NewtypesSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/NewtypesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/NullableSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/NullableSmokeSpec.scala index d3c110ab7..57e745283 100644 --- a/modules/bootstrapped/test/src/smithy4s/NullableSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/NullableSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2022 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ObjectCollisionSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/ObjectCollisionSmokeSpec.scala index 80ec8f66a..771b67585 100644 --- a/modules/bootstrapped/test/src/smithy4s/ObjectCollisionSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ObjectCollisionSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/PackedInputsSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/PackedInputsSmokeSpec.scala index 63c431c69..6e83f3343 100644 --- a/modules/bootstrapped/test/src/smithy4s/PackedInputsSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/PackedInputsSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/PatternSpec.scala b/modules/bootstrapped/test/src/smithy4s/PatternSpec.scala index fdb6ba05f..240058a10 100644 --- a/modules/bootstrapped/test/src/smithy4s/PatternSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/PatternSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ProductSerialSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/ProductSerialSmokeSpec.scala index 56eed4088..c7e3d0ab5 100644 --- a/modules/bootstrapped/test/src/smithy4s/ProductSerialSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ProductSerialSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/RecursiveTraitStructureSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/RecursiveTraitStructureSmokeSpec.scala index c41bd5a8e..0514b7e89 100644 --- a/modules/bootstrapped/test/src/smithy4s/RecursiveTraitStructureSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/RecursiveTraitStructureSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ReservedTypeSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/ReservedTypeSmokeSpec.scala index efd59ee04..bf5ff9db4 100644 --- a/modules/bootstrapped/test/src/smithy4s/ReservedTypeSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ReservedTypeSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/SchemaEqualitySmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/SchemaEqualitySmokeSpec.scala index 206179e1c..5e15ffd5f 100644 --- a/modules/bootstrapped/test/src/smithy4s/SchemaEqualitySmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/SchemaEqualitySmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ServiceWithResourcesSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/ServiceWithResourcesSmokeSpec.scala index 7cffb466b..e2e97f37a 100644 --- a/modules/bootstrapped/test/src/smithy4s/ServiceWithResourcesSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ServiceWithResourcesSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ShapeIdHintsSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/ShapeIdHintsSmokeSpec.scala index d519254e3..64b67d95b 100644 --- a/modules/bootstrapped/test/src/smithy4s/ShapeIdHintsSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ShapeIdHintsSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ShapeIdParseSpec.scala b/modules/bootstrapped/test/src/smithy4s/ShapeIdParseSpec.scala index bf481b7db..bb7af258d 100644 --- a/modules/bootstrapped/test/src/smithy4s/ShapeIdParseSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ShapeIdParseSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/StubSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/StubSmokeSpec.scala index 73ff772d5..cbe28fd90 100644 --- a/modules/bootstrapped/test/src/smithy4s/StubSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/StubSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/SummonSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/SummonSmokeSpec.scala index 43a1d03a9..052697c46 100644 --- a/modules/bootstrapped/test/src/smithy4s/SummonSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/SummonSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/TransformationSpec.scala b/modules/bootstrapped/test/src/smithy4s/TransformationSpec.scala index 9d4101a2b..4d41c93a7 100644 --- a/modules/bootstrapped/test/src/smithy4s/TransformationSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/TransformationSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/TypeInferenceSmokeSpec.scala b/modules/bootstrapped/test/src/smithy4s/TypeInferenceSmokeSpec.scala index d111e6eeb..aa63bd711 100644 --- a/modules/bootstrapped/test/src/smithy4s/TypeInferenceSmokeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/TypeInferenceSmokeSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/ValidatedNewtypesSpec.scala b/modules/bootstrapped/test/src/smithy4s/ValidatedNewtypesSpec.scala index bb54fa269..2746e7b60 100644 --- a/modules/bootstrapped/test/src/smithy4s/ValidatedNewtypesSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/ValidatedNewtypesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/VisitorAndProjectionSpec.scala b/modules/bootstrapped/test/src/smithy4s/VisitorAndProjectionSpec.scala index 9c46659d9..e468422db 100644 --- a/modules/bootstrapped/test/src/smithy4s/VisitorAndProjectionSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/VisitorAndProjectionSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/builder/EndpointBuilderSpec.scala b/modules/bootstrapped/test/src/smithy4s/builder/EndpointBuilderSpec.scala index af06fd0b4..65afaf424 100644 --- a/modules/bootstrapped/test/src/smithy4s/builder/EndpointBuilderSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/builder/EndpointBuilderSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/builder/ServiceBuilderSpec.scala b/modules/bootstrapped/test/src/smithy4s/builder/ServiceBuilderSpec.scala index b9a602ab6..2ec426d4a 100644 --- a/modules/bootstrapped/test/src/smithy4s/builder/ServiceBuilderSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/builder/ServiceBuilderSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/codecs/StringAndBlobSpec.scala b/modules/bootstrapped/test/src/smithy4s/codecs/StringAndBlobSpec.scala index 1ba12bd43..3151fe87d 100644 --- a/modules/bootstrapped/test/src/smithy4s/codecs/StringAndBlobSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/codecs/StringAndBlobSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/expect.scala b/modules/bootstrapped/test/src/smithy4s/expect.scala index 7b995c59f..f18826f22 100644 --- a/modules/bootstrapped/test/src/smithy4s/expect.scala +++ b/modules/bootstrapped/test/src/smithy4s/expect.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/CaseInsensitiveSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/CaseInsensitiveSpec.scala index 6af90ba63..8b9a89627 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/CaseInsensitiveSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/CaseInsensitiveSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/HostPrefixSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/HostPrefixSpec.scala index a09df3b53..43a319dc9 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/HostPrefixSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/HostPrefixSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/HttpErrorSelectorSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/HttpErrorSelectorSpec.scala index 332a4b24e..02d74302a 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/HttpErrorSelectorSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/HttpErrorSelectorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/HttpRequestSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/HttpRequestSpec.scala index aaebdf150..6de10e42d 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/HttpRequestSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/HttpRequestSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s.http import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/http/HttpStatusCodeSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/HttpStatusCodeSpec.scala index 90e783eec..64716d324 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/HttpStatusCodeSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/HttpStatusCodeSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s.http import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/http/MatchPathSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/MatchPathSpec.scala index e45811e9d..23a9d59f7 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/MatchPathSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/MatchPathSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/MetadataDecoderSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/MetadataDecoderSpec.scala index a859e9997..7fcbef74a 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/MetadataDecoderSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/MetadataDecoderSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s.http import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/http/internals/HeaderSplitSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/internals/HeaderSplitSpec.scala index 890142a4c..be498d4ad 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/internals/HeaderSplitSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/internals/HeaderSplitSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/internals/HttpResponseCodeSchemaVisitorSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/internals/HttpResponseCodeSchemaVisitorSpec.scala index e9e393290..b1205e22f 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/internals/HttpResponseCodeSchemaVisitorSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/internals/HttpResponseCodeSchemaVisitorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/internals/MetadataSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/internals/MetadataSpec.scala index 43e55ebd3..43e431866 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/internals/MetadataSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/internals/MetadataSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/internals/PathSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/internals/PathSpec.scala index 280deda91..d5b9d8438 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/internals/PathSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/internals/PathSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/http/internals/UrlFormDataEncoderDecoderSchemaVisitorSpec.scala b/modules/bootstrapped/test/src/smithy4s/http/internals/UrlFormDataEncoderDecoderSchemaVisitorSpec.scala index e10734756..91b08a665 100644 --- a/modules/bootstrapped/test/src/smithy4s/http/internals/UrlFormDataEncoderDecoderSchemaVisitorSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/http/internals/UrlFormDataEncoderDecoderSchemaVisitorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/internals/SchemaDescriptionSpec.scala b/modules/bootstrapped/test/src/smithy4s/internals/SchemaDescriptionSpec.scala index d0c1a77f5..19d5c61bf 100644 --- a/modules/bootstrapped/test/src/smithy4s/internals/SchemaDescriptionSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/internals/SchemaDescriptionSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/internals/StructurePatternRefinementProviderSpec.scala b/modules/bootstrapped/test/src/smithy4s/internals/StructurePatternRefinementProviderSpec.scala index 292534735..eac7f2598 100644 --- a/modules/bootstrapped/test/src/smithy4s/internals/StructurePatternRefinementProviderSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/internals/StructurePatternRefinementProviderSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/optics/CompositionSpec.scala b/modules/bootstrapped/test/src/smithy4s/optics/CompositionSpec.scala index 61d481f74..53dc7ca18 100644 --- a/modules/bootstrapped/test/src/smithy4s/optics/CompositionSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/optics/CompositionSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s.optics import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/optics/LensSpec.scala b/modules/bootstrapped/test/src/smithy4s/optics/LensSpec.scala index 97c1aba04..9c7341fba 100644 --- a/modules/bootstrapped/test/src/smithy4s/optics/LensSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/optics/LensSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s.optics import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/optics/PrismSpec.scala b/modules/bootstrapped/test/src/smithy4s/optics/PrismSpec.scala index 3490332d3..79e0916c5 100644 --- a/modules/bootstrapped/test/src/smithy4s/optics/PrismSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/optics/PrismSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s.optics import munit._ diff --git a/modules/bootstrapped/test/src/smithy4s/schema/DefaultValueSpec.scala b/modules/bootstrapped/test/src/smithy4s/schema/DefaultValueSpec.scala index c5665b080..f69d1e043 100644 --- a/modules/bootstrapped/test/src/smithy4s/schema/DefaultValueSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/schema/DefaultValueSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/schema/FieldSpec.scala b/modules/bootstrapped/test/src/smithy4s/schema/FieldSpec.scala index 641a235ac..463a75f03 100644 --- a/modules/bootstrapped/test/src/smithy4s/schema/FieldSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/schema/FieldSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s package schema diff --git a/modules/bootstrapped/test/src/smithy4s/schema/HintsTransformationSpec.scala b/modules/bootstrapped/test/src/smithy4s/schema/HintsTransformationSpec.scala index f1ea8e3c5..8fdeea25d 100644 --- a/modules/bootstrapped/test/src/smithy4s/schema/HintsTransformationSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/schema/HintsTransformationSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/schema/SchemaPartitionSpec.scala b/modules/bootstrapped/test/src/smithy4s/schema/SchemaPartitionSpec.scala index 95f7046ba..67a6ff6a4 100644 --- a/modules/bootstrapped/test/src/smithy4s/schema/SchemaPartitionSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/schema/SchemaPartitionSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bootstrapped/test/src/smithy4s/schema/SchemaSpec.scala b/modules/bootstrapped/test/src/smithy4s/schema/SchemaSpec.scala index 50931a9e7..0a9b5b4f6 100644 --- a/modules/bootstrapped/test/src/smithy4s/schema/SchemaSpec.scala +++ b/modules/bootstrapped/test/src/smithy4s/schema/SchemaSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 Disney Streaming + * Copyright 2021-2024 Disney Streaming * * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-newtype-flatten/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-newtype-flatten/build.sbt index 5ef8d4590..6170668f9 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-newtype-flatten/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-newtype-flatten/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.10", + scalaVersion := "2.13.15", libraryDependencies ++= Seq( "com.disneystreaming.smithy4s" %% "smithy4s-aws-kernel" % smithy4sVersion.value ), diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-newtype-flatten/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-newtype-flatten/project/build.properties deleted file mode 100644 index 46e43a97e..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-newtype-flatten/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.2 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-open-enums/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-open-enums/build.sbt index f7c5ed65f..3bf2ecba2 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-open-enums/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-open-enums/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.10", + scalaVersion := "2.13.15", libraryDependencies ++= Seq( "com.disneystreaming.smithy4s" %% "smithy4s-aws-kernel" % smithy4sVersion.value ) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-open-enums/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-open-enums/project/build.properties deleted file mode 100644 index 46e43a97e..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-open-enums/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.2 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-specs/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-specs/build.sbt index 3f85f40be..fd0f222e5 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-specs/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-specs/build.sbt @@ -1,6 +1,6 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.10", + scalaVersion := "2.13.15", smithy4sAwsSpecs ++= Seq(AWS.dynamodb) ) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-specs/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-specs/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/aws-specs/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/custom-settings/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/custom-settings/build.sbt index 5377ed157..8f08de30a 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/custom-settings/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/custom-settings/build.sbt @@ -1,5 +1,5 @@ lazy val commonSettings = Def.settings( - scalaVersion := "2.13.6", + scalaVersion := "2.13.15", Compile / smithy4sInputDirs := Seq( (ThisBuild / baseDirectory).value / "smithy_input" ), diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/custom-settings/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/custom-settings/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/custom-settings/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/defaults/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/defaults/build.sbt index 15ce75672..bda94b3b6 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/defaults/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/defaults/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.10", + scalaVersion := "2.13.15", libraryDependencies ++= Seq( "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value, "com.disneystreaming.smithy4s" %% "smithy4s-dynamic" % smithy4sVersion.value diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/defaults/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/defaults/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/defaults/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/dependencies-only/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/dependencies-only/build.sbt index 80e7d4e7b..458e40170 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/dependencies-only/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/dependencies-only/build.sbt @@ -1,7 +1,7 @@ lazy val p1 = project .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.6", + scalaVersion := "2.13.15", Compile / smithy4sAllowedNamespaces := List( "aws.iam" ), diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/dependencies-only/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/dependencies-only/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/dependencies-only/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/extra-configs/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/extra-configs/build.sbt index 639ff5002..ed23aebfc 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/extra-configs/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/extra-configs/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.6", + scalaVersion := "2.13.15", libraryDependencies += "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value, Smithy4sCodegenPlugin.defaultSettings(Test) ) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/extra-configs/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/extra-configs/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/extra-configs/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-aws/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-aws/build.sbt index f5bc7434e..05695d9e8 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-aws/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-aws/build.sbt @@ -1,6 +1,6 @@ import smithy4s.codegen.BuildInfo._ -ThisBuild / scalaVersion := "2.13.8" +ThisBuild / scalaVersion := "2.13.15" lazy val foo = (project in file("foo")) .enablePlugins(Smithy4sCodegenPlugin) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-aws/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-aws/project/build.properties deleted file mode 100644 index 563a014da..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-aws/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.7.2 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-no-compile/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-no-compile/build.sbt index e14d589fe..91b25f7e4 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-no-compile/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-no-compile/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.13.10" +ThisBuild / scalaVersion := "2.13.15" lazy val foo = (project in file("foo")) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-no-compile/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-no-compile/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-no-compile/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/build.sbt index f04d36b1c..91fa36d22 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/build.sbt @@ -1,6 +1,6 @@ import smithy4s.codegen.BuildInfo.smithyVersion -ThisBuild / scalaVersion := "2.13.10" +ThisBuild / scalaVersion := "2.13.15" ThisBuild / version := "0.0.1-SNAPSHOT" ThisBuild / organization := "foobar" diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule-staged/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule/build.sbt index 9a4f1f959..25887a813 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.13.10" +ThisBuild / scalaVersion := "2.13.15" lazy val root = project .in(file(".")) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/multimodule/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/optics-generate/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/optics-generate/build.sbt index 3ada07e61..47bc6cdd2 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/optics-generate/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/optics-generate/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.10", + scalaVersion := "2.13.15", Compile / smithy4sRenderOptics := true, libraryDependencies ++= Seq( "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value, diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/optics-generate/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/optics-generate/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/optics-generate/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/protobuf/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/protobuf/build.sbt index c6fbec281..6001e4942 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/protobuf/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/protobuf/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.10", + scalaVersion := "2.13.15", libraryDependencies ++= Seq( "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value ) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/protobuf/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/protobuf/project/build.properties deleted file mode 100644 index 46e43a97e..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/protobuf/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.2 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/render-validated-newtypes/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/render-validated-newtypes/build.sbt index 3fe4c889c..1070f5d6d 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/render-validated-newtypes/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/render-validated-newtypes/build.sbt @@ -1,10 +1,10 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.10", + scalaVersion := "2.13.15", libraryDependencies ++= Seq( "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value, "com.disneystreaming.smithy4s" %% "smithy4s-dynamic" % smithy4sVersion.value, - "com.disneystreaming.alloy" % "alloy-core" % "0.3.4", + "com.disneystreaming.alloy" % "alloy-core" % "0.3.4" ) ) diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/render-validated-newtypes/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/render-validated-newtypes/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/render-validated-newtypes/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/scala3/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/scala3/project/build.properties deleted file mode 100644 index 8b9a0b0ab..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/scala3/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.0 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-build/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-build/build.sbt index 9abb225ad..b0590262c 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-build/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-build/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.13", + scalaVersion := "2.13.15", libraryDependencies ++= Seq( "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value ), diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-build/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-build/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-build/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-rules/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-rules/build.sbt index 9efd8eb1b..6e1c671f5 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-rules/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-rules/build.sbt @@ -1,7 +1,7 @@ lazy val root = (project in file(".")) .enablePlugins(Smithy4sCodegenPlugin) .settings( - scalaVersion := "2.13.10", + scalaVersion := "2.13.15", libraryDependencies ++= Seq( "com.disneystreaming.smithy4s" %% "smithy4s-core" % smithy4sVersion.value, "software.amazon.smithy" % "smithy-rules-engine" % smithy4s.codegen.BuildInfo.smithyVersion % Smithy4s diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-rules/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-rules/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/smithy-rules/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/update-lsp-config/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/build.sbt b/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/build.sbt index a03f8a4e8..e9d8dd6c5 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/build.sbt +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/build.sbt @@ -1,4 +1,4 @@ -val scala213 = "2.13.10" +val scala213 = "2.13.15" val scala3 = "3.3.0" val expectedWildcardArgument = diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/project/build.properties b/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/test b/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/test index 42a1ffba5..858ea1cb1 100644 --- a/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/test +++ b/modules/codegen-plugin/src/sbt-test/codegen-plugin/wildcard-config/test @@ -1,7 +1,7 @@ # use "_" if major version is not 3 -> check _ 2.13.2 -> check _ 2.13.2 -source future -> check _ 2.13.2 -source:future +> check _ 2.13.15 +> check _ 2.13.15 -source future +> check _ 2.13.15 -source:future # use "?" if major version >= 3.1 or using -source:future or -source future > check ? 3.1.foobar @@ -12,10 +12,12 @@ > check _ 3.0.foobar > check _ 3.foobar.foobar -> ++2.13.10 root/compile +> ++2.13.15 +> root/compile $ exists target/scala-2.13/src_managed/main/smithy/generated-metadata.smithy $ exists target/scala-2.13/resource_managed/main/META-INF/smithy/generated-metadata.smithy -> ++3.3.0 root/compile +> ++3.3.0 +> root/compile $ exists target/scala-3.3.0/src_managed/main/smithy/generated-metadata.smithy $ exists target/scala-3.3.0/resource_managed/main/META-INF/smithy/generated-metadata.smithy diff --git a/modules/codegen/test/src/smithy4s/codegen/transformers/ValidatedNewtypesTransformerSpec.scala b/modules/codegen/test/src/smithy4s/codegen/transformers/ValidatedNewtypesTransformerSpec.scala index 0f9ed0577..74647b94c 100644 --- a/modules/codegen/test/src/smithy4s/codegen/transformers/ValidatedNewtypesTransformerSpec.scala +++ b/modules/codegen/test/src/smithy4s/codegen/transformers/ValidatedNewtypesTransformerSpec.scala @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package smithy4s.codegen.transformers import software.amazon.smithy.build.TransformContext diff --git a/modules/core/project/build.properties b/modules/core/project/build.properties deleted file mode 100644 index 72413de15..000000000 --- a/modules/core/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.3 diff --git a/modules/decline/test/src/smithy4s/decline/core/CommonsSpec.scala b/modules/decline/test/src/smithy4s/decline/core/CommonsSpec.scala index 49ed79034..45b39f805 100644 --- a/modules/decline/test/src/smithy4s/decline/core/CommonsSpec.scala +++ b/modules/decline/test/src/smithy4s/decline/core/CommonsSpec.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2024 Disney Streaming + * + * Licensed under the Tomorrow Open Source Technology License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://disneystreaming.github.io/TOST-1.0.txt + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package smithy4s.decline.core import weaver._ diff --git a/modules/docs/markdown/01-overview/02-quickstart.md b/modules/docs/markdown/01-overview/02-quickstart.md index 10e7b6706..52b82ecfc 100644 --- a/modules/docs/markdown/01-overview/02-quickstart.md +++ b/modules/docs/markdown/01-overview/02-quickstart.md @@ -50,7 +50,7 @@ import smithy4s.codegen.mill._ import mill._, mill.scalalib._ object example extends ScalaModule with Smithy4sModule { - def scalaVersion = "2.13.8" + def scalaVersion = "2.13.15" override def ivyDeps = Agg( ivy"com.disneystreaming.smithy4s::smithy4s-core:${smithy4sVersion()}", ivy"com.disneystreaming.smithy4s::smithy4s-http4s-swagger:${smithy4sVersion()}", diff --git a/modules/docs/markdown/01-overview/03-installation.md b/modules/docs/markdown/01-overview/03-installation.md index d210d3311..3da410b63 100644 --- a/modules/docs/markdown/01-overview/03-installation.md +++ b/modules/docs/markdown/01-overview/03-installation.md @@ -59,7 +59,7 @@ import smithy4s.codegen.mill._ import mill._, mill.scalalib._ object example extends ScalaModule with Smithy4sModule { - def scalaVersion = "2.13.8" + def scalaVersion = "2.13.15" override def ivyDeps = Agg( ivy"com.disneystreaming.smithy4s::smithy4s-core:${smithy4sVersion()}" ) @@ -76,7 +76,7 @@ import smithy4s.codegen.mill._ import mill._, mill.scalalib._ object example extends ScalaModule with Smithy4sModule { - def scalaVersion = "2.13.8" + def scalaVersion = "2.13.15" override def ivyDeps = Agg( ivy"com.disneystreaming.smithy4s::smithy4s-core:${smithy4sVersion()}" ) diff --git a/modules/docs/markdown/03-protocols/03-aws/01-aws.md b/modules/docs/markdown/03-protocols/03-aws/01-aws.md index 77725c8cd..9a119025c 100644 --- a/modules/docs/markdown/03-protocols/03-aws/01-aws.md +++ b/modules/docs/markdown/03-protocols/03-aws/01-aws.md @@ -52,7 +52,7 @@ import $ivy.`com.disneystreaming.smithy4s::smithy4s-mill-codegen-plugin::@VERSIO import smithy4s.codegen.mill._ object foo extends Smithy4sModule { - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg( ivy"com.disneystreaming.smithy4s::smithy4s-aws-http4s:${smithy4sVersion()}", ) diff --git a/modules/docs/markdown/06-guides/model-preprocessing.md b/modules/docs/markdown/06-guides/model-preprocessing.md index 17bdc70c6..26223cb16 100644 --- a/modules/docs/markdown/06-guides/model-preprocessing.md +++ b/modules/docs/markdown/06-guides/model-preprocessing.md @@ -76,7 +76,7 @@ import mill._ import scalalib._ object preprocessors extends ScalaModule { - def scalaVersion = "2.13.10" // 2.13 to match what Mill uses + def scalaVersion = "2.13.15" // 2.13 to match what Mill uses def ivyDeps = Agg( s"software.amazon.smithy:smithy-build:${smithy4s.codegen.BuildInfo.smithyVersion}" ) diff --git a/modules/dynamic/test/src-jvm/smithy4s/dynamic/ModelWrapper.scala b/modules/dynamic/test/src-jvm/smithy4s/dynamic/ModelWrapper.scala index f2b8eef18..2e2179122 100644 --- a/modules/dynamic/test/src-jvm/smithy4s/dynamic/ModelWrapper.scala +++ b/modules/dynamic/test/src-jvm/smithy4s/dynamic/ModelWrapper.scala @@ -35,7 +35,7 @@ class ModelWrapper(val model: Model) { private final implicit class JavaStreamOps[A]( stream: java.util.stream.Stream[A] ) { - def toList: List[A] = stream.collect(Collectors.toList()).asScala.toList + def asList: List[A] = stream.collect(Collectors.toList()).asScala.toList } override def equals(obj: Any): Boolean = obj match { @@ -48,20 +48,20 @@ class ModelWrapper(val model: Model) { .newModel(two) .compare() .getDifferences() - val added = diff.addedShapes().toList + val added = diff.addedShapes().asList val hasChanges = diff .changedShapes() - .toList + .asList .exists { changed => val addedTraits = - changed.addedTraits().toList + changed.addedTraits().asList val removedTraits = changed .removedTraits() - .toList + .asList val changedTraits = changed .changedTraits() - .toList + .asList .filterNot { pair => // compare shapeId and node values to avoid issues with differing java classes pair.getLeft.toShapeId == pair.getRight.toShapeId && pair.getLeft.toNode == pair.getRight.toNode @@ -73,7 +73,7 @@ class ModelWrapper(val model: Model) { addedTraits.nonEmpty || removedTraits.nonEmpty || changedTraits.nonEmpty } val removed = - diff.removedShapes().toList + diff.removedShapes().asList added.isEmpty && !hasChanges && removed.isEmpty case _ => false } diff --git a/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/Smithy4sModuleSpec.scala b/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/Smithy4sModuleSpec.scala index 2bf389bfa..c5e03c082 100644 --- a/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/Smithy4sModuleSpec.scala +++ b/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/Smithy4sModuleSpec.scala @@ -41,7 +41,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { test("basic codegen runs") { object foo extends testKit.BaseModule with Smithy4sModule { - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg(coreDep) override def millSourcePath = resourcePath / "basic" } @@ -90,9 +90,9 @@ class Smithy4sModuleSpec extends munit.FunSuite { } val msg1 = """use "_" if major version is not 3""" - assertEquals(getArg("2.13.2", Seq()), "_", msg1) - assertEquals(getArg("2.13.2", Seq("-source", "future")), "_", msg1) - assertEquals(getArg("2.13.2", Seq("-source:future")), "_", msg1) + assertEquals(getArg("2.13.15", Seq()), "_", msg1) + assertEquals(getArg("2.13.15", Seq("-source", "future")), "_", msg1) + assertEquals(getArg("2.13.15", Seq("-source:future")), "_", msg1) val msg2 = """use "?" if major version >= 3.1 or using -source:future or -source future""" @@ -128,7 +128,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { test("codegen with dependencies") { object foo extends testKit.BaseModule with Smithy4sModule { - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg(coreDep) override def millSourcePath = resourcePath / "basic" override def smithy4sAllowedNamespaces = T(Some(Set("aws.iam"))) @@ -148,7 +148,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { test("codegen with custom smithy-build.json works") { object foo extends testKit.BaseModule with Smithy4sModule { - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg(coreDep) override def millSourcePath = resourcePath / "smithy-build" override def smithyBuild = @@ -171,14 +171,14 @@ class Smithy4sModuleSpec extends munit.FunSuite { test("multi-module codegen works") { object foo extends testKit.BaseModule with Smithy4sModule { - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg(coreDep) override def millSourcePath = resourcePath / "multi-module" / "foo" } object bar extends testKit.BaseModule with Smithy4sModule { override def moduleDeps = Seq(foo) - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg(coreDep) override def millSourcePath = resourcePath / "multi-module" / "bar" } @@ -220,7 +220,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { test("multi-module codegen works with AWS specs upstream") { object foo extends testKit.BaseModule with Smithy4sModule { - override def scalaVersion = "2.13.8" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg( ivy"com.disneystreaming.smithy4s::smithy4s-aws-kernel:${smithy4s.codegen.BuildInfo.version}" ) @@ -232,7 +232,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { object bar extends testKit.BaseModule with Smithy4sModule { override def moduleDeps = Seq(foo) - override def scalaVersion = "2.13.8" + override def scalaVersion = "2.13.15" override def millSourcePath = resourcePath / "multi-module-aws" / "bar" } @@ -274,14 +274,14 @@ class Smithy4sModuleSpec extends munit.FunSuite { ) { object foo extends testKit.BaseModule with ScalaModule { - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def millSourcePath = resourcePath / "multi-module-no-compile" / "foo" } object bar extends testKit.BaseModule with Smithy4sModule { override def moduleDeps = Seq(foo) - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg(coreDep) override def millSourcePath = resourcePath / "multi-module-no-compile" / "bar" @@ -303,7 +303,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { with SbtModule with Smithy4sModule with PublishModule { - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def repositoriesTask: Task[Seq[Repository]] = T.task { val ivy2Local = IvyRepository.fromPattern( (localIvyRepo.toNIO.toUri.toString + "/") +: coursier.ivy.Pattern.default, @@ -325,7 +325,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { object foo extends Base { override def artifactName: T[String] = "foo-mill" - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg(coreDep) override def smithy4sAllowedNamespaces: T[Option[Set[String]]] = Some(Set("aws.api", "foo")) @@ -339,7 +339,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { object bar extends Base { override def artifactName: T[String] = "bar-mill" - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" // bar depend on foo as a library, and an assumption is made that bar may depend on the same smithy models // that foo depended on for its own codegen. Therefore, these are retrieved from foo's manifest, // resolved and added to the list of jars to seek smithy models from during code generation @@ -372,7 +372,7 @@ class Smithy4sModuleSpec extends munit.FunSuite { test("codegen with aws specs") { object foo extends testKit.BaseModule with Smithy4sModule { - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def ivyDeps = Agg(coreDep) override def smithy4sAwsSpecs: T[Seq[String]] = T( Seq(AWS.dynamodb) diff --git a/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala b/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala index 0c7a51cc3..8d7b6df6d 100644 --- a/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala +++ b/modules/mill-codegen-plugin/test/src/smithy4s/codegen/mill/SmithyLSPConfigSpec.scala @@ -36,7 +36,7 @@ class SmithyLSPConfigSpec extends munit.FunSuite { ) ) } - override def scalaVersion = "2.13.10" + override def scalaVersion = "2.13.15" override def smithy4sAllowedNamespaces = T(Some(Set("aws.iam"))) override def smithy4sIvyDeps = Agg( ivy"software.amazon.smithy:smithy-aws-iam-traits:${smithy4s.codegen.BuildInfo.smithyVersion}" diff --git a/project/Smithy4sBuildPlugin.scala b/project/Smithy4sBuildPlugin.scala index d499cc486..39043acfd 100644 --- a/project/Smithy4sBuildPlugin.scala +++ b/project/Smithy4sBuildPlugin.scala @@ -18,6 +18,7 @@ import org.scalajs.jsenv.nodejs.NodeJSEnv import com.github.sbt.git.SbtGit.git import bloop.integrations.sbt.BloopKeys.bloopGenerate import java.time.OffsetDateTime +import de.heikoseeberger.sbtheader.HeaderPlugin sealed trait Platform case object JSPlatform extends Platform @@ -29,9 +30,9 @@ case class CatsEffectAxis(idSuffix: String, directorySuffix: String) object Smithy4sBuildPlugin extends AutoPlugin { - val Scala212 = "2.12.19" - val Scala213 = "2.13.13" - val Scala3 = "3.3.3" + val Scala212 = "2.12.20" + val Scala213 = "2.13.15" + val Scala3 = "3.3.4" object autoImport { // format: off @@ -81,7 +82,7 @@ object Smithy4sBuildPlugin extends AutoPlugin { } } - override def requires = plugins.JvmPlugin + override def requires = plugins.JvmPlugin && HeaderPlugin override def trigger = allRequirements override def buildSettings: Seq[Setting[_]] = Seq( diff --git a/project/build.properties b/project/build.properties index 72413de15..bc7390601 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 +sbt.version=1.10.3