From 0e183a051dd77cb14e49b74e433ab67adf730e79 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Fri, 20 Sep 2024 11:06:57 +0200 Subject: [PATCH 1/4] feat: upgrade dependencies --- CHANGELOG.md | 8 ++++++++ app/build.gradle.kts | 8 ++++---- gradle.properties | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81c9ead..4edd515 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 068d861..1acb54d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -62,7 +62,7 @@ android { 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" @@ -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 diff --git a/gradle.properties b/gradle.properties index 7b0bb90..63bc112 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 2024.04.23 +version = 2024.09.20 archivesBaseName = keyple-android-demo-validation # Project-wide Gradle settings. From c5771a028148fb544da6377ac98bc16366d68e82 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Fri, 20 Sep 2024 11:24:33 +0200 Subject: [PATCH 2/4] feat: upgrade GitHub actions --- .github/workflows/java-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-test.yml b/.github/workflows/java-test.yml index 73bef16..cc35907 100644 --- a/.github/workflows/java-test.yml +++ b/.github/workflows/java-test.yml @@ -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' From 0ec46edf0c2d921f7b888f69106a9a71dc21a5ad Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Fri, 20 Sep 2024 12:14:48 +0200 Subject: [PATCH 3/4] feat: automatic versionCode generation --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1acb54d..96958b3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -56,8 +56,8 @@ android { minSdk = 24 //noinspection ExpiredTargetSdkVersion targetSdk = 31 - versionCode = 6 versionName = project.version.toString() + versionCode = versionName!!.replace(".", "").toIntOrNull() ?: 1 } buildTypes { From 7b34f6fff98595e8355099bc7dada3e259c826ae Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Fri, 20 Sep 2024 14:52:34 +0200 Subject: [PATCH 4/4] wip --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4edd515..dfe232e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ 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`