Skip to content

Commit

Permalink
EPMRPP-97122 || Update to JDK 21 (#65)
Browse files Browse the repository at this point in the history
  • Loading branch information
APiankouski authored Nov 27, 2024
1 parent bc00459 commit 57146c8
Show file tree
Hide file tree
Showing 9 changed files with 232 additions and 164 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/manualy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,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 @@ -22,11 +22,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
26 changes: 16 additions & 10 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.8.RELEASE'
id 'io.spring.dependency-management' version '1.1.6'
id 'java'
id 'java-library'
}
Expand All @@ -15,11 +15,12 @@ def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/

apply from: scriptsUrl + '/release-commons.gradle'
apply from: scriptsUrl + '/signing.gradle'
apply from: scriptsUrl + '/build-quality.gradle'
//apply from: scriptsUrl + '/build-quality.gradle'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
wrapper.gradleVersion('6.0')
java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

repositories {
mavenCentral { url "https://repo1.maven.org/maven2" }
Expand All @@ -37,14 +38,19 @@ dependencyManagement {

dependencies {
if (releaseMode) {
compile 'com.epam.reportportal:commons'
compile 'com.epam.reportportal:commons-dao'
implementation 'com.epam.reportportal:commons-dao'
api 'com.epam.reportportal:commons'
} else {
implementation 'com.github.reportportal:commons-dao:develop-SNAPSHOT'
api 'com.github.reportportal:commons:develop-SNAPSHOT'
implementation 'com.github.reportportal:commons-dao:3505f19'
api 'com.github.reportportal:commons:c6bbec1'
}
api 'org.pf4j:pf4j:3.10.0'
api 'org.pf4j:pf4j-update:2.3.0'

testCompile 'junit:junit'
testImplementation 'junit:junit'
}


wrapper {
gradleVersion = '8.10'
}
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-6.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 57146c8

Please sign in to comment.