Skip to content
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

feat: upgrade dependencies #26

Merged
merged 4 commits into from
Sep 20, 2024
Merged

feat: upgrade dependencies #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e183a0
feat: upgrade dependencies
jeanpierrefortune Sep 20, 2024
c5771a0
feat: upgrade GitHub actions
jeanpierrefortune Sep 20, 2024
0ec46ed
feat: automatic versionCode generation
jeanpierrefortune Sep 20, 2024
7b34f6f
wip
jeanpierrefortune Sep 20, 2024
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/java-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code from ${{ github.repository }}/${{ github.ref }}
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]
### Fixed
- Android client build.
### Upgraded
- Keyple components
- keyple-service-java-lib `3.2.1` -> `3.3.1`
- keyple-card-calypso-java-lib `3.1.1` -> `3.1.3`
- keyple-card-calypso-crypto-legacysam-java-lib `0.7.0` -> `0.8.0`

## [2024.04.23]
### Upgraded
Expand Down
10 changes: 5 additions & 5 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ android {
minSdk = 24
//noinspection ExpiredTargetSdkVersion
targetSdk = 31
versionCode = 6
versionName = project.version.toString()
versionCode = versionName!!.replace(".", "").toIntOrNull() ?: 1
}

buildTypes {
getByName("release") {
isMinifyEnabled = true // Enables code shrinking for the release build type.
isMinifyEnabled = false // Disables code shrinking for the release build type.
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
Expand Down Expand Up @@ -127,9 +127,9 @@ dependencies {
implementation("org.eclipse.keypop:keypop-calypso-crypto-legacysam-java-api:0.6.0")
implementation("org.eclipse.keyple:keyple-common-java-api:2.0.1")
implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0")
implementation("org.eclipse.keyple:keyple-service-java-lib:3.2.1")
implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.1")
implementation("org.eclipse.keyple:keyple-card-calypso-crypto-legacysam-java-lib:0.7.0")
implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.1")
implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.3")
implementation("org.eclipse.keyple:keyple-card-calypso-crypto-legacysam-java-lib:0.8.0")
implementation("org.eclipse.keyple:keyple-plugin-android-nfc-java-lib:2.2.0")
// End Keyple configuration

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 2024.04.23
version = 2024.09.20
archivesBaseName = keyple-android-demo-validation

# Project-wide Gradle settings.
Expand Down