Skip to content

build(deps)!: JGIT 7.1 (Requires Java 17) (#67). #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmongard merged 1 commit into from
Jan 13, 2025
Merged

build(deps)!: JGIT 7.1 (Requires Java 17) (#67). #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/gradle-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 6 additions & 11 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/git/semver/plugin/scm/GitProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
Loading