diff --git a/.github/workflows/gradle-push.yml b/.github/workflows/gradle-push.yml index 5312263..423e5de 100644 --- a/.github/workflows/gradle-push.yml +++ b/.github/workflows/gradle-push.yml @@ -38,8 +38,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 8 - distribution: adopt + java-version: 17 + distribution: 'temurin' - uses: actions/cache@v4 with: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 470bbc6..b15d277 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -18,8 +18,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 8 - distribution: adopt + java-version: 17 + distribution: 'temurin' - uses: actions/cache@v4 with: diff --git a/build.gradle.kts b/build.gradle.kts index d0b2acf..232d362 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,19 +22,14 @@ repositories { } dependencies { - implementation(kotlin("stdlib-jdk8")) + implementation(kotlin("stdlib")) + implementation("org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r") + implementation("org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.1.0.202411261347-r") + implementation("org.slf4j:slf4j-api:1.7.36") + testImplementation(kotlin("test-junit5")) testImplementation("org.junit.jupiter:junit-jupiter-params") - testImplementation("org.assertj:assertj-core:3.26.3") - - implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.3.202401111512-r") - implementation("org.eclipse.jgit:org.eclipse.jgit.gpg.bc:5.13.3.202401111512-r") { - exclude(group = "org.bouncycastle") - } - implementation("org.bouncycastle:bcpg-jdk18on:1.79") - implementation("org.bouncycastle:bcutil-jdk18on:1.79") - implementation("org.bouncycastle:bcpkix-jdk18on:1.79") - implementation("org.slf4j:slf4j-api:1.7.36") + testImplementation("org.assertj:assertj-core:3.27.2") } gradlePlugin { diff --git a/src/main/kotlin/git/semver/plugin/scm/GitProvider.kt b/src/main/kotlin/git/semver/plugin/scm/GitProvider.kt index 8c7e0a8..7a94d44 100644 --- a/src/main/kotlin/git/semver/plugin/scm/GitProvider.kt +++ b/src/main/kotlin/git/semver/plugin/scm/GitProvider.kt @@ -13,6 +13,7 @@ import org.eclipse.jgit.revwalk.RevWalk import org.eclipse.jgit.util.FS import org.slf4j.LoggerFactory import java.io.File +import java.util.* internal class GitProvider(private val settings: SemverSettings) { companion object { @@ -131,7 +132,7 @@ internal class GitProvider(private val settings: SemverSettings) { revWalk.parseHeaders(parent) yield(getCommit(parent, revWalk)) } - }, commit.authorIdent.name, commit.authorIdent.emailAddress, commit.authorIdent.`when`) + }, commit.authorIdent.name, commit.authorIdent.emailAddress, Date.from(commit.authorIdent.whenAsInstant)) } internal fun checkDirty(noDirtyCheck: Boolean, isClean: Boolean) {