Skip to content

Commit

Permalink
EPMRPP-97485 || Update to java 21 (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
APiankouski authored Dec 4, 2024
1 parent ec84fde commit 0cce96e
Show file tree
Hide file tree
Showing 9 changed files with 218 additions and 140 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
java-version: '21'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
java-version: '21'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
16 changes: 9 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "io.spring.dependency-management" version "1.0.9.RELEASE"
id "io.spring.dependency-management" version "1.1.4"
id 'java'
id 'jacoco'
id "com.github.spotbugs" version "4.0.0"
Expand Down Expand Up @@ -40,13 +40,15 @@ dependencies {
implementation("com.epam.reportportal:plugin-api")
annotationProcessor 'com.epam.reportportal:plugin-api'
} else {
implementation 'com.github.reportportal:commons-dao:acf1ec7'
implementation("com.github.reportportal:plugin-api:188792e")
annotationProcessor 'com.github.reportportal:plugin-api:188792e'
implementation 'com.github.reportportal:commons-dao:adbb40e'
implementation 'com.github.reportportal:plugin-api:develop-SNAPSHOT'
annotationProcessor 'com.github.reportportal:plugin-api:develop-SNAPSHOT'
}

implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2'

hello("com.apollographql.apollo3:apollo-runtime:3.8.2")
hello("com.squareup.okhttp3:okhttp:4.9.3")
hello("com.squareup.okhttp3:okhttp:4.11.0")

hello group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'

Expand All @@ -59,7 +61,7 @@ test {
useJUnitPlatform()
jacocoTestReport {
reports {
xml.enabled true
xml.required = true
}
}
}
Expand Down Expand Up @@ -175,7 +177,7 @@ task plugin(type: Jar) {
into('lib') {
from configurations.compileClasspath
}
extension('zip')
archiveExtension.set('zip')
}

task assemblePlugin(type: Copy) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 0cce96e

Please sign in to comment.