Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump up Java 21 #132

Merged
merged 1 commit into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: Gradle Caching
uses: actions/cache@v3
with:
Expand All @@ -48,7 +48,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: Gradle Caching
uses: actions/cache@v3
with:
Expand All @@ -74,7 +74,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: Gradle Caching
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: Gradle Caching
uses: actions/cache@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: Gradle Caching
uses: actions/cache@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: Extract tag version
run: echo "tag=$(echo '${{ github.ref_name }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(-p[0-9]+)?')" >> $GITHUB_OUTPUT
id: extract_tag_version
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
idea
id("net.researchgate.release") version "3.0.2"
kotlin("jvm") version "1.9.24" apply false
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion doc/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Prerequisite

- Scavenger is a combination of various server components(API, Frontend, Collector) and agent component.
To install scavenger, you need JDK 17 or latest version.
To install scavenger, you need JDK 21 or latest version.
- Scavenger uses 2 ports. if some ports are blocked by your firewall, you should ask the network admin to open the
following ports in the firewall.
These ports can be configured by the configuration.
Expand Down
2 changes: 1 addition & 1 deletion scavenger-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ configure<DependencyManagementExtension> {
}

kotlin {
jvmToolchain(17)
jvmToolchain(21)
}

tasks.withType<KotlinCompile> {
Expand Down
2 changes: 1 addition & 1 deletion scavenger-collector/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ configure<DependencyManagementExtension> {
}

kotlin {
jvmToolchain(17)
jvmToolchain(21)
}

tasks.withType<KotlinCompile> {
Expand Down
2 changes: 1 addition & 1 deletion scavenger-demo-extension/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
}

kotlin {
jvmToolchain(17)
jvmToolchain(21)
}

tasks.withType<KotlinCompile> {
Expand Down
2 changes: 1 addition & 1 deletion scavenger-demo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
}

kotlin {
jvmToolchain(17)
jvmToolchain(21)
}

tasks.withType<KotlinCompile> {
Expand Down
2 changes: 1 addition & 1 deletion scavenger-entity/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

Expand Down
3 changes: 3 additions & 0 deletions scavenger-old-agent-java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ dependencies {
java {
withJavadocJar()
withSourcesJar()
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about discontinuing Java 7 support from now on?

Copy link
Contributor Author

@sohyun-ku sohyun-ku Jul 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's good.
If we keep supporting java 7, we'll have to give up more because of considering minimum java version compatibility.

}
}

tasks.compileJava {
Expand Down
6 changes: 6 additions & 0 deletions scavenger-old-model/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ dependencies {
testImplementation("org.hamcrest:hamcrest:2.2")
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

tasks.compileJava {
sourceCompatibility = "7"
targetCompatibility = "7"
Expand Down
Loading