Skip to content

Commit

Permalink
feat(DATA-1808): Ugrading to java version 17
Browse files Browse the repository at this point in the history
  • Loading branch information
Johnyz21 committed Jul 31, 2024
1 parent 5aadbf1 commit 7d9a3c2
Show file tree
Hide file tree
Showing 9 changed files with 217 additions and 138 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11.0.12
java-version: 17.0.12
- name: Test
run: ./gradlew test
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17.0
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
buildscript {
repositories {
jcenter()
gradlePluginPortal()
}
dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
classpath 'com.github.johnrengelman:shadow:8.1.1'
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0"
}
}
Expand All @@ -25,8 +25,8 @@ allprojects {
version = '1.0'

apply plugin: 'java'
sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 17
targetCompatibility = 17

repositories {
mavenCentral()
Expand Down Expand Up @@ -60,15 +60,15 @@ dependencies {
}



task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
tasks.register('javadocJar', Jar) {
dependsOn javadoc
archiveClassifier = 'javadoc'
from subprojects*.tasks.javadoc.destinationDir
}

task sourcesJar(type: Jar) {
tasks.register('sourcesJar', Jar) {
from subprojects*.sourceSets.main.allSource
classifier = 'sources'
archiveClassifier = 'sources'
}

jar {
Expand Down
4 changes: 4 additions & 0 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ dependencies {
testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
testImplementation group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0'
}

tasks.test {
jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
}
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 7d9a3c2

Please sign in to comment.