Skip to content

Commit 4ab83f6

Browse files
committed
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 aws-powertools#702
1 parent 478fb75 commit 4ab83f6

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

docs/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,13 @@ For more information about the project and available options refer to this [repo
117117
aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}'
118118
aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}'
119119
aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}'
120+
implementation 'software.amazon.lambda:powertools-logging:{{ powertools.version }}'
121+
implementation 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}'
122+
implementation 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}'
120123
}
124+
125+
sourceCompatibility = 11
126+
targetCompatibility = 11
121127
```
122128

123129
## Environment variables
Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
plugins{
22
id 'java'
3-
id 'aspectj.AspectjGradlePlugin' version '0.0.7'
3+
id 'io.freefair.aspectj.post-compile-weaving' version '6.3.0'
44
}
55

66
repositories {
77
mavenCentral()
88
}
99

1010
dependencies {
11-
implementation 'software.amazon.lambda:powertools-tracing:1.10.2'
12-
aspectpath 'software.amazon.lambda:powertools-tracing:1.10.2'
11+
aspect 'software.amazon.lambda:powertools-logging:1.10.2'
12+
aspect 'software.amazon.lambda:powertools-tracing:1.10.2'
13+
aspect 'software.amazon.lambda:powertools-metrics:1.10.2'
14+
aspect 'software.amazon.lambda:powertools-sqs:1.10.2'
15+
aspect 'software.amazon.lambda:powertools-parameters:1.10.2'
16+
aspect 'software.amazon.lambda:powertools-validation:1.10.2'
1317

18+
implementation 'software.amazon.lambda:powertools-tracing:1.10.2'
1419
implementation 'software.amazon.lambda:powertools-logging:1.10.2'
15-
aspectpath 'software.amazon.lambda:powertools-logging:1.10.2'
16-
1720
implementation 'software.amazon.lambda:powertools-metrics:1.10.2'
18-
aspectpath 'software.amazon.lambda:powertools-metrics:1.10.2'
19-
2021
implementation 'software.amazon.lambda:powertools-sqs:1.10.2'
21-
aspectpath 'software.amazon.lambda:powertools-sqs:1.10.2'
22-
2322
implementation 'software.amazon.lambda:powertools-parameters:1.10.2'
24-
aspectpath 'software.amazon.lambda:powertools-parameters:1.10.2'
25-
2623
implementation 'software.amazon.lambda:powertools-validation:1.10.2'
27-
aspectpath 'software.amazon.lambda:powertools-validation:1.10.2'
2824

2925
implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
3026
implementation 'com.amazonaws:aws-lambda-java-events:3.1.0'
3127

3228
implementation 'org.apache.logging.log4j:log4j-api:2.16.0'
3329
implementation 'org.apache.logging.log4j:log4j-core:2.16.0'
3430

35-
testImplementation 'junit:junit:4.12'
36-
}
31+
testImplementation 'junit:junit:4.13.2'
32+
}
33+
34+
sourceCompatibility = 11
35+
targetCompatibility = 11
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

example/HelloWorldFunction/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>junit</groupId>
7474
<artifactId>junit</artifactId>
75-
<version>4.13.1</version>
75+
<version>4.13.2</version>
7676
<scope>test</scope>
7777
</dependency>
7878
</dependencies>

0 commit comments

Comments
 (0)