Skip to content

Commit

Permalink
Merge pull request #23 from mrautio/feature/fix-build-2024-09-06
Browse files Browse the repository at this point in the history
Fix build errors and update dependencies
  • Loading branch information
mrautio authored Sep 6, 2024
2 parents a2a1486 + 0264af4 commit 189d514
Show file tree
Hide file tree
Showing 11 changed files with 392 additions and 1,252 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ jobs:
- run: cargo install cargo-edit
- run: cd src/test/rust/simulator && cargo upgrade && cargo update && cargo test
- run: cd src/main/rust/cardtool && cargo upgrade && cargo update && cargo test
# NOTE: checkstyle version is fixed in build.gradle
- run: gradle dependencies --write-locks
- run: gradle --write-verification-metadata sha512 help
# dockerimage.yml is not triggered without repo scoped token, doing testing in the task, ref. https://github.com/peter-evans/create-pull-request/issues/48
- run: gradle build
- run: gradle -Pjc_version=3.0.5 --console=verbose clean cap --info
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:latest
FROM alpine:3.20

WORKDIR /tmp

Expand Down Expand Up @@ -27,4 +27,4 @@ RUN gradle build \
&& gradle -Pjc_version=2.2.1 --console=verbose clean cap --info && mkdir --parents /tmp/javacard_build/2_2_1 && mv /tmp/build/*.cap /tmp/javacard_build/2_2_1/ \
&& tar cvzf javacard_build.tar.gz javacard_build

CMD exit
CMD exit
7 changes: 0 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ buildscript {
repositories {
mavenCentral()
}
configurations.classpath {
resolutionStrategy.activateDependencyLocking()
}
}

plugins {
Expand Down Expand Up @@ -115,10 +112,6 @@ dependencies {
javacardAntTask 'com.github.martinpaljak:ant-javacard:latest.release'
}

dependencyLocking {
lockAllConfigurations()
}

test {
dependsOn buildSimulatorLibrary
workingDir 'src/test/java/emvcardsimulator'
Expand Down
4 changes: 0 additions & 4 deletions buildscript-gradle.lockfile

This file was deleted.

29 changes: 0 additions & 29 deletions gradle.lockfile

This file was deleted.

11 changes: 0 additions & 11 deletions gradle/dependency-locks/gp.lockfile

This file was deleted.

903 changes: 0 additions & 903 deletions gradle/verification-metadata.xml

This file was deleted.

Loading

0 comments on commit 189d514

Please sign in to comment.