Skip to content
Open
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
15 changes: 13 additions & 2 deletions .github/workflows/sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,24 @@ jobs:
EV_RELAY_HOST: strict.relay.evervault.com
steps:
- uses: actions/checkout@v7
- name: Set up JDK ${{ matrix.java-version }} with ${{ matrix.distribution }}
- name: Set up JDK ${{ matrix.java-version }} test toolchain
uses: actions/setup-java@v5
with:
distribution: 'corretto'
java-version: ${{ matrix.java-version }}
# Gradle 9 requires JVM 17+ to run the Gradle process itself, even
# though it can still compile/test against older JDKs via toolchains.
# This second setup-java call overwrites JAVA_HOME with a JDK new
# enough to launch Gradle, while leaving JAVA_HOME_<version>_X64 from
# the step above in place so Gradle's toolchain auto-detection can
# still find the matrix JDK to actually run the tests on.
- name: Set up JDK 21 to run Gradle
uses: actions/setup-java@v5
with:
distribution: 'corretto'
java-version: '21'
- name: unit tests
run: ./gradlew clean test --info
run: ./gradlew clean test --info -PtestJavaVersion=${{ matrix.java-version }}
env:
TEST_EV_APP_ID: ${{ secrets.TEST_EV_APP_ID }}
TEST_EV_API_KEY: ${{ secrets.TEST_EV_API_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

plugins {
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
}

group 'com.evervault'
Expand Down
4 changes: 2 additions & 2 deletions buildscript-gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:1.1.0=classpath
io.github.gradle-nexus:publish-plugin:1.1.0=classpath
io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:2.0.0=classpath
io.github.gradle-nexus:publish-plugin:2.0.0=classpath
empty=
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gradle.java.installations.fromEnv=JAVA_HOME_8_X64,JAVA_HOME_11_X64,JAVA_HOME_16_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
54 changes: 34 additions & 20 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 28 additions & 35 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def getKeyPassword() {

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation "com.github.tomakehurst:wiremock-jre8:2.32.0"
testImplementation "org.mockito:mockito-core:3.12.4"

Expand All @@ -42,6 +43,11 @@ java {
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
if (project.hasProperty('testJavaVersion')) {
toolchain {
languageVersion = JavaLanguageVersion.of(project.property('testJavaVersion') as int)
}
}
}

tasks.named('test', Test) {
Expand Down
1 change: 1 addition & 0 deletions lib/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ org.junit.jupiter:junit-jupiter-params:5.7.2=testCompileClasspath,testRuntimeCla
org.junit.jupiter:junit-jupiter:5.7.2=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.7.2=testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.7.2=testRuntimeClasspath
org.junit.platform:junit-platform-launcher:1.7.2=testRuntimeClasspath
org.junit:junit-bom:5.7.2=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:3.12.4=testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.2=testCompileClasspath,testRuntimeClasspath
Expand Down
Loading