Skip to content

Commit 91e49c5

Browse files
anuraagaanuraaga
authored
Use Java 17 for building, still target Java 8 by default (#117)
1 parent 48ec2e1 commit 91e49c5

File tree

8 files changed

+44
-26
lines changed

8 files changed

+44
-26
lines changed

‎.github/workflows/main-build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
- uses: actions/checkout@v2
1414
with:
1515
fetch-depth: 0
16-
- name: Setup Java 11
16+
- name: Setup Java 17
1717
uses: actions/setup-java@v2
1818
with:
1919
distribution: adopt
20-
java-version: 11
20+
java-version: 17
2121
- uses: burrunan/gradle-cache-action@v1
2222
name: Build
2323
with:
@@ -36,11 +36,11 @@ jobs:
3636
- uses: actions/checkout@v2
3737
with:
3838
fetch-depth: 0
39-
- name: Setup Java 11
39+
- name: Setup Java 17
4040
uses: actions/setup-java@v2
4141
with:
4242
distribution: adopt
43-
java-version: 11
43+
java-version: 17
4444
- uses: burrunan/gradle-cache-action@v1
4545
name: Integration Tests
4646
with:
@@ -60,11 +60,11 @@ jobs:
6060
- uses: actions/checkout@v2
6161
with:
6262
fetch-depth: 0
63-
- name: Setup Java 11
63+
- name: Setup Java 17
6464
uses: actions/setup-java@v2
6565
with:
6666
distribution: adopt
67-
java-version: 11
67+
java-version: 17
6868
- uses: burrunan/gradle-cache-action@v1
6969
name: Publish
7070
with:

‎.github/workflows/patch-release-build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ jobs:
5555
- uses: actions/checkout@v2
5656
with:
5757
fetch-depth: 0
58-
- name: Setup Java 11
58+
- name: Setup Java 17
5959
uses: actions/setup-java@v2
6060
with:
6161
distribution: adopt
62-
java-version: 11
62+
java-version: 17
6363
- uses: burrunan/gradle-cache-action@v1
6464
name: Build
6565
with:
@@ -79,11 +79,11 @@ jobs:
7979
- uses: actions/checkout@v2
8080
with:
8181
fetch-depth: 0
82-
- name: Setup Java 11
82+
- name: Setup Java 17
8383
uses: actions/setup-java@v2
8484
with:
8585
distribution: adopt
86-
java-version: 11
86+
java-version: 17
8787
- uses: burrunan/gradle-cache-action@v1
8888
name: Integration Tests
8989
with:
@@ -103,11 +103,11 @@ jobs:
103103
- uses: actions/checkout@v2
104104
with:
105105
fetch-depth: 0
106-
- name: Setup Java 11
106+
- name: Setup Java 17
107107
uses: actions/setup-java@v2
108108
with:
109109
distribution: adopt
110-
java-version: 11
110+
java-version: 17
111111
- uses: burrunan/gradle-cache-action@v1
112112
name: Publish
113113
with:

‎.github/workflows/pr-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
- uses: actions/checkout@v2
1414
with:
1515
fetch-depth: 0
16-
- name: Setup Java 11
16+
- name: Setup Java 17
1717
uses: actions/setup-java@v2
1818
with:
1919
distribution: adopt
20-
java-version: 11
20+
java-version: 17
2121
- uses: burrunan/gradle-cache-action@v1
2222
name: Build
2323
with:
@@ -36,11 +36,11 @@ jobs:
3636
- uses: actions/checkout@v2
3737
with:
3838
fetch-depth: 0
39-
- name: Setup Java 11
39+
- name: Setup Java 17
4040
uses: actions/setup-java@v2
4141
with:
4242
distribution: adopt
43-
java-version: 11
43+
java-version: 17
4444
- uses: burrunan/gradle-cache-action@v1
4545
name: Integration Tests
4646
with:

‎.github/workflows/release-build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
- uses: actions/checkout@v2
1616
with:
1717
fetch-depth: 0
18-
- name: Setup Java 11
18+
- name: Setup Java 17
1919
uses: actions/setup-java@v2
2020
with:
2121
distribution: adopt
22-
java-version: 11
22+
java-version: 17
2323
- uses: burrunan/gradle-cache-action@v1
2424
name: Build
2525
with:
@@ -38,11 +38,11 @@ jobs:
3838
- uses: actions/checkout@v2
3939
with:
4040
fetch-depth: 0
41-
- name: Setup Java 11
41+
- name: Setup Java 17
4242
uses: actions/setup-java@v2
4343
with:
4444
distribution: adopt
45-
java-version: 11
45+
java-version: 17
4646
- uses: burrunan/gradle-cache-action@v1
4747
name: Integration Tests
4848
with:
@@ -62,11 +62,11 @@ jobs:
6262
- uses: actions/checkout@v2
6363
with:
6464
fetch-depth: 0
65-
- name: Setup Java 11
65+
- name: Setup Java 17
6666
uses: actions/setup-java@v2
6767
with:
6868
distribution: adopt
69-
java-version: 11
69+
java-version: 17
7070
- uses: burrunan/gradle-cache-action@v1
7171
name: Publish
7272
with:

‎buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ base.archivesName.set("opentelemetry-${project.name}")
1313

1414
java {
1515
toolchain {
16-
languageVersion.set(JavaLanguageVersion.of(11))
16+
languageVersion.set(JavaLanguageVersion.of(17))
1717
}
1818

1919
withJavadocJar()

‎gradle.properties‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,21 @@ org.gradle.parallel=true
22
org.gradle.caching=true
33

44
org.gradle.priority=low
5+
6+
# Gradle default is 256m which causes issues with our build - https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
7+
# Also workaround https://github.com/diffplug/spotless/issues/834
8+
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m \
9+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
10+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
11+
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
12+
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
13+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
14+
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
15+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
16+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
17+
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
18+
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
19+
20+
# Workaround https://youtrack.jetbrains.com/issue/KT-47152
21+
# We don't have enough kotlin code to care about incremental compilation anyways.
22+
kotlin.incremental=false

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
4-
distributionSha256Sum=2debee19271e1b82c6e41137d78e44e6e841035230a1a169ca47fd3fb09ed87b
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
4+
distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pluginManagement {
44
id("com.github.johnrengelman.shadow") version "7.0.0"
55
id("org.unbroken-dome.test-sets") version "4.0.0"
66
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
7-
id("nebula.release") version "15.3.1"
7+
id("nebula.release") version "16.0.0"
88
}
99
}
1010

0 commit comments

Comments
 (0)