Skip to content

Commit a879e33

Browse files
committed
Upgrade gradle to latest and update github actions
1 parent 3e3d490 commit a879e33

28 files changed

Lines changed: 222 additions & 209 deletions

File tree

.github/workflows/main.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,45 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
java: [8, 11, 13, 16, 17, 18-ea]
15+
java: [8, 11, 17, 21]
1616
name: 'Linux JDK ${{ matrix.java }} Maven'
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: 'Checkout'
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121
- name: 'Set up JDK'
22-
uses: actions/setup-java@v1
22+
uses: actions/setup-java@v3
2323
with:
24+
distribution: 'zulu'
2425
java-version: ${{ matrix.java }}
2526
- name: 'Test'
2627
run: ./mvnw ${MAVEN_ARGS} -U clean verify
2728
linux_gradle:
2829
strategy:
2930
fail-fast: false
3031
matrix:
31-
java: [8, 11]
32+
java: [8, 11, 17, 21]
3233
name: 'Linux JDK ${{ matrix.java }} Gradle'
3334
runs-on: ubuntu-latest
3435
steps:
3536
- name: 'Checkout'
36-
uses: actions/checkout@v2
37+
uses: actions/checkout@v3
3738
- name: 'Set up JDK'
38-
uses: actions/setup-java@v1
39+
uses: actions/setup-java@v3
3940
with:
41+
distribution: 'zulu'
4042
java-version: ${{ matrix.java }}
4143
- name: 'Test'
4244
run: ./gradlew buildAll
4345
windows_maven:
4446
name: 'Windows'
4547
runs-on: windows-latest
4648
steps:
47-
- uses: actions/checkout@v2
49+
- uses: actions/checkout@v3
4850
- name: 'Set up JDK 8'
49-
uses: actions/setup-java@v1
51+
uses: actions/setup-java@v3
5052
with:
53+
distribution: 'zulu'
5154
java-version: 8
5255
- name: 'Test'
5356
run: ./mvnw ${MAVEN_ARGS} -U clean verify
@@ -57,24 +60,26 @@ jobs:
5760
steps:
5861
- uses: actions/checkout@v2
5962
- name: 'Set up JDK 8'
60-
uses: actions/setup-java@v1
63+
uses: actions/setup-java@v3
6164
with:
65+
distribution: 'zulu'
6266
java-version: 8
6367
- name: 'Test'
6468
run: ./mvnw ${MAVEN_ARGS} -U clean verify
6569
linux_bazel:
6670
strategy:
6771
fail-fast: false
6872
matrix:
69-
java: [8, 11]
73+
java: [8, 11, 17, 21]
7074
name: 'Linux JDK ${{ matrix.java }} Bazel'
7175
runs-on: ubuntu-latest
7276
steps:
7377
- name: Checkout
74-
uses: actions/checkout@v2
78+
uses: actions/checkout@v3
7579
- name: Set up JDK
76-
uses: actions/setup-java@v1
80+
uses: actions/setup-java@v3
7781
with:
82+
distribution: 'zulu'
7883
java-version: ${{ matrix.java }}
7984
- name: Mount bazel cache
8085
uses: actions/cache@v1
@@ -93,7 +98,3 @@ jobs:
9398
- name: Build
9499
run: |
95100
"${GITHUB_WORKSPACE}/bin/bazel" build //...
96-
97-
98-
99-

gradle/wrapper/gradle-wrapper.jar

508 Bytes
Binary file not shown.
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.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 4 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mapstruct-kotlin-gradle/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.5.10"
5-
kotlin("kapt") version "1.5.10"
4+
kotlin("jvm") version "1.9.10"
5+
kotlin("kapt") version "1.9.10"
66
}
77

88
group = "org.mapstruct.examples"
99
version = "1.0.0-SNAPSHOT"
1010

11+
java.sourceCompatibility = org.gradle.api.JavaVersion.VERSION_1_8
12+
1113
repositories {
1214
mavenCentral()
1315
}
4.68 KB
Binary file not shown.
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.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

mapstruct-kotlin-gradle/gradlew

Lines changed: 33 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mapstruct-kotlin-gradle/gradlew.bat

Lines changed: 24 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)