From 4ab83f65784774c23259fedbafbff1e0cbe007f0 Mon Sep 17 00:00:00 2001 From: Michael Brewer Date: Sun, 9 Jan 2022 19:37:51 -0800 Subject: [PATCH 1/2] fix(gradle): Fix gradle example and docs to work with java 12+ Changes: - Bump gradle version to 7.3.3 - Use `io.freefair.aspectj.post-compile-weaving` in example project - Specify java 11 for sourceCompatibility, targetCompatibility - Bump junit version to 4.13.2 closes #702 --- docs/index.md | 6 +++++ example/HelloWorldFunction/build.gradle | 27 +++++++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/HelloWorldFunction/pom.xml | 2 +- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/docs/index.md b/docs/index.md index 115edc566..96b3876fe 100644 --- a/docs/index.md +++ b/docs/index.md @@ -117,7 +117,13 @@ For more information about the project and available options refer to this [repo aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}' aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}' aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}' + implementation 'software.amazon.lambda:powertools-logging:{{ powertools.version }}' + implementation 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}' + implementation 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}' } + + sourceCompatibility = 11 + targetCompatibility = 11 ``` ## Environment variables diff --git a/example/HelloWorldFunction/build.gradle b/example/HelloWorldFunction/build.gradle index c7c774a33..dd701790b 100644 --- a/example/HelloWorldFunction/build.gradle +++ b/example/HelloWorldFunction/build.gradle @@ -1,6 +1,6 @@ plugins{ id 'java' - id 'aspectj.AspectjGradlePlugin' version '0.0.7' + id 'io.freefair.aspectj.post-compile-weaving' version '6.3.0' } repositories { @@ -8,23 +8,19 @@ repositories { } dependencies { - implementation 'software.amazon.lambda:powertools-tracing:1.10.2' - aspectpath 'software.amazon.lambda:powertools-tracing:1.10.2' + aspect 'software.amazon.lambda:powertools-logging:1.10.2' + aspect 'software.amazon.lambda:powertools-tracing:1.10.2' + aspect 'software.amazon.lambda:powertools-metrics:1.10.2' + aspect 'software.amazon.lambda:powertools-sqs:1.10.2' + aspect 'software.amazon.lambda:powertools-parameters:1.10.2' + aspect 'software.amazon.lambda:powertools-validation:1.10.2' + implementation 'software.amazon.lambda:powertools-tracing:1.10.2' implementation 'software.amazon.lambda:powertools-logging:1.10.2' - aspectpath 'software.amazon.lambda:powertools-logging:1.10.2' - implementation 'software.amazon.lambda:powertools-metrics:1.10.2' - aspectpath 'software.amazon.lambda:powertools-metrics:1.10.2' - implementation 'software.amazon.lambda:powertools-sqs:1.10.2' - aspectpath 'software.amazon.lambda:powertools-sqs:1.10.2' - implementation 'software.amazon.lambda:powertools-parameters:1.10.2' - aspectpath 'software.amazon.lambda:powertools-parameters:1.10.2' - implementation 'software.amazon.lambda:powertools-validation:1.10.2' - aspectpath 'software.amazon.lambda:powertools-validation:1.10.2' implementation 'com.amazonaws:aws-lambda-java-core:1.2.1' implementation 'com.amazonaws:aws-lambda-java-events:3.1.0' @@ -32,5 +28,8 @@ dependencies { implementation 'org.apache.logging.log4j:log4j-api:2.16.0' implementation 'org.apache.logging.log4j:log4j-core:2.16.0' - testImplementation 'junit:junit:4.12' -} \ No newline at end of file + testImplementation 'junit:junit:4.13.2' +} + +sourceCompatibility = 11 +targetCompatibility = 11 diff --git a/example/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties b/example/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties index 2a563242c..2e6e5897b 100644 --- a/example/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties +++ b/example/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/HelloWorldFunction/pom.xml b/example/HelloWorldFunction/pom.xml index 5c6000a5f..bdc469eca 100644 --- a/example/HelloWorldFunction/pom.xml +++ b/example/HelloWorldFunction/pom.xml @@ -72,7 +72,7 @@ junit junit - 4.13.1 + 4.13.2 test From c0106e0cac0c747a38c88864925899d389c7a0f7 Mon Sep 17 00:00:00 2001 From: Michael Brewer Date: Mon, 10 Jan 2022 12:13:37 -0800 Subject: [PATCH 2/2] fix: no need to include implementation --- docs/index.md | 3 --- example/HelloWorldFunction/build.gradle | 7 ------- 2 files changed, 10 deletions(-) diff --git a/docs/index.md b/docs/index.md index 96b3876fe..e25844f52 100644 --- a/docs/index.md +++ b/docs/index.md @@ -117,9 +117,6 @@ For more information about the project and available options refer to this [repo aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}' aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}' aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}' - implementation 'software.amazon.lambda:powertools-logging:{{ powertools.version }}' - implementation 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}' - implementation 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}' } sourceCompatibility = 11 diff --git a/example/HelloWorldFunction/build.gradle b/example/HelloWorldFunction/build.gradle index dd701790b..f2447ed2a 100644 --- a/example/HelloWorldFunction/build.gradle +++ b/example/HelloWorldFunction/build.gradle @@ -15,13 +15,6 @@ dependencies { aspect 'software.amazon.lambda:powertools-parameters:1.10.2' aspect 'software.amazon.lambda:powertools-validation:1.10.2' - implementation 'software.amazon.lambda:powertools-tracing:1.10.2' - implementation 'software.amazon.lambda:powertools-logging:1.10.2' - implementation 'software.amazon.lambda:powertools-metrics:1.10.2' - implementation 'software.amazon.lambda:powertools-sqs:1.10.2' - implementation 'software.amazon.lambda:powertools-parameters:1.10.2' - implementation 'software.amazon.lambda:powertools-validation:1.10.2' - implementation 'com.amazonaws:aws-lambda-java-core:1.2.1' implementation 'com.amazonaws:aws-lambda-java-events:3.1.0'