open-telemetry
/
opentelemetry-java-contrib
mirror of https://github.com/open-telemetry/opentelemetry-java-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Java 17 for building, still target Java 8 by default (#117)

This commit is contained in:
Anuraag Agrawal 2021-10-18 16:23:06 +09:00 committed by GitHub
parent 48ec2e13f3
commit 91e49c53db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/main-build.yml vendored
View File

@ -13,11 +13,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Build
with:
@ -36,11 +36,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Integration Tests
with:
@ -60,11 +60,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Publish
with:

12
.github/workflows/patch-release-build.yml vendored
View File

@ -55,11 +55,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Build
with:
@ -79,11 +79,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Integration Tests
with:
@ -103,11 +103,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Publish
with:

8
.github/workflows/pr-build.yml vendored
View File

@ -13,11 +13,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Build
with:
@ -36,11 +36,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Integration Tests
with:

12
.github/workflows/release-build.yml vendored
View File

@ -15,11 +15,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Build
with:
@ -38,11 +38,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Integration Tests
with:
@ -62,11 +62,11 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup Java 11
- name: Setup Java 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
java-version: 17
- uses: burrunan/gradle-cache-action@v1
name: Publish
with:

2
buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
View File

@ -13,7 +13,7 @@ base.archivesName.set("opentelemetry-${project.name}")
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(17))
}
withJavadocJar()

18
gradle.properties
View File

@ -2,3 +2,21 @@ org.gradle.parallel=true
org.gradle.caching=true
org.gradle.priority=low
# Gradle default is 256m which causes issues with our build - https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
# Also workaround https://github.com/diffplug/spotless/issues/834
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m \
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
# Workaround https://youtrack.jetbrains.com/issue/KT-47152
# We don't have enough kotlin code to care about incremental compilation anyways.
kotlin.incremental=false

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionSha256Sum=2debee19271e1b82c6e41137d78e44e6e841035230a1a169ca47fd3fb09ed87b
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
settings.gradle.kts
View File

@ -4,7 +4,7 @@ pluginManagement {
id("com.github.johnrengelman.shadow") version "7.0.0"
id("org.unbroken-dome.test-sets") version "4.0.0"
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
id("nebula.release") version "15.3.1"
id("nebula.release") version "16.0.0"
}
}