Skip to content

Commit 75115a1

Browse files
maxdaymaxday
authored
fix: java gradle version (#3375)
* feat: remove dotnet on al2 * fix: version * fix: gradle version
1 parent b1ab9e8 commit 75115a1

9 files changed

Lines changed: 37 additions & 22 deletions

File tree

‎s3-uploader/runtimes/java11/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM public.ecr.aws/lambda/java:11 AS builder
22
WORKDIR /tmpBuild
33
RUN yum install -y unzip
4-
RUN curl -k -L -v -X GET https://services.gradle.org/distributions/gradle-8.3-bin.zip > gradle-8.3-bin.zip
5-
RUN unzip -d /opt/gradle gradle-8.3-bin.zip
4+
RUN curl -k -L -v -X GET https://services.gradle.org/distributions/gradle-9.2.1-bin.zip > gradle-9.2.1-bin.zip
5+
RUN unzip -d /opt/gradle gradle-9.2.1-bin.zip
66

77
COPY src ./src
88
COPY build.gradle .
99

10-
RUN JAVA_HOME=/var/lang /opt/gradle/gradle-8.3/bin/gradle :buildZip
10+
RUN JAVA_HOME=/var/lang /opt/gradle/gradle-9.2.1/bin/gradle :buildZip
1111

1212
FROM scratch
1313
COPY --from=builder /tmpBuild/build/distributions/code.zip /

‎s3-uploader/runtimes/java11/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ repositories {
44
mavenCentral()
55
}
66

7-
sourceCompatibility = 11
8-
targetCompatibility = 11
7+
java {
8+
toolchain {
9+
languageVersion = JavaLanguageVersion.of(11)
10+
}
11+
}
912

1013
task buildZip(type: Zip) {
1114
archiveBaseName = 'code'

‎s3-uploader/runtimes/java17/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM public.ecr.aws/lambda/java:17 AS builder
22
WORKDIR /tmpBuild
33
RUN yum install -y unzip
4-
RUN curl -k -L -v -X GET https://services.gradle.org/distributions/gradle-8.3-bin.zip > gradle-8.3-bin.zip
5-
RUN unzip -d /opt/gradle gradle-8.3-bin.zip
4+
RUN curl -k -L -v -X GET https://services.gradle.org/distributions/gradle-9.2.1-bin.zip > gradle-9.2.1-bin.zip
5+
RUN unzip -d /opt/gradle gradle-9.2.1-bin.zip
66

77
COPY src ./src
88
COPY build.gradle .
99

10-
RUN JAVA_HOME=/var/lang /opt/gradle/gradle-8.3/bin/gradle :buildZip
10+
RUN JAVA_HOME=/var/lang /opt/gradle/gradle-9.2.1/bin/gradle :buildZip
1111

1212
FROM scratch
1313
COPY --from=builder /tmpBuild/build/distributions/code.zip /

‎s3-uploader/runtimes/java17/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ repositories {
44
mavenCentral()
55
}
66

7-
sourceCompatibility = 17
8-
targetCompatibility = 17
7+
java {
8+
toolchain {
9+
languageVersion = JavaLanguageVersion.of(17)
10+
}
11+
}
912

1013
task buildZip(type: Zip) {
1114
archiveBaseName = 'code'

‎s3-uploader/runtimes/java21/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ WORKDIR /tmpBuild
33
RUN dnf -y update
44
RUN dnf -y install zip
55
RUN dnf -y install findutils
6-
RUN curl -k -L -v -X GET https://services.gradle.org/distributions/gradle-8.3-bin.zip > gradle-8.3-bin.zip
7-
RUN unzip -d /opt/gradle gradle-8.3-bin.zip
6+
RUN curl -k -L -v -X GET https://services.gradle.org/distributions/gradle-9.2.1-bin.zip > gradle-9.2.1-bin.zip
7+
RUN unzip -d /opt/gradle gradle-9.2.1-bin.zip
88

99
COPY src ./src
1010
COPY build.gradle .
1111

12-
RUN JAVA_HOME=/var/lang /opt/gradle/gradle-8.3/bin/gradle :buildZip
12+
RUN JAVA_HOME=/var/lang /opt/gradle/gradle-9.2.1/bin/gradle :buildZip
1313

1414
FROM scratch
1515
COPY --from=builder /tmpBuild/build/distributions/code.zip /

‎s3-uploader/runtimes/java21/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ repositories {
44
mavenCentral()
55
}
66

7-
sourceCompatibility = 21
8-
targetCompatibility = 21
7+
java {
8+
toolchain {
9+
languageVersion = JavaLanguageVersion.of(21)
10+
}
11+
}
912

1013
task buildZip(type: Zip) {
1114
archiveBaseName = 'code'

‎s3-uploader/runtimes/java25/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ WORKDIR /tmpBuild
33
RUN dnf -y update
44
RUN dnf -y install zip
55
RUN dnf -y install findutils
6-
RUN curl -k -L -v -X GET https://services.gradle.org/distributions/gradle-8.3-bin.zip > gradle-8.3-bin.zip
7-
RUN unzip -d /opt/gradle gradle-8.3-bin.zip
6+
RUN curl -k -L -v -X GET https://services.gradle.org/distributions/gradle-9.2.1-bin.zip > gradle-9.2.1-bin.zip
7+
RUN unzip -d /opt/gradle gradle-9.2.1-bin.zip
88

99
COPY src ./src
1010
COPY build.gradle .
1111

12-
RUN JAVA_HOME=/var/lang /opt/gradle/gradle-8.3/bin/gradle :buildZip
12+
RUN JAVA_HOME=/var/lang /opt/gradle/gradle-9.2.1/bin/gradle :buildZip
1313

1414
FROM scratch
1515
COPY --from=builder /tmpBuild/build/distributions/code.zip /

‎s3-uploader/runtimes/java25/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ repositories {
44
mavenCentral()
55
}
66

7-
sourceCompatibility = 25
8-
targetCompatibility = 25
7+
java {
8+
toolchain {
9+
languageVersion = JavaLanguageVersion.of(25)
10+
}
11+
}
912

1013
task buildZip(type: Zip) {
1114
archiveBaseName = 'code'

‎s3-uploader/runtimes/java8_al2/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ repositories {
44
mavenCentral()
55
}
66

7-
sourceCompatibility = 1.8
8-
targetCompatibility = 1.8
7+
java {
8+
toolchain {
9+
languageVersion = JavaLanguageVersion.of(8)
10+
}
11+
}
912

1013
task buildZip(type: Zip) {
1114
archiveBaseName = 'code'

0 commit comments

Comments
 (0)