From 4c15fc3e5e501ab117d1529328bb0ee330b3dd90 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Fortune Date: Wed, 16 Oct 2024 10:15:01 +0200 Subject: [PATCH] refact: rename repos (#24) --- CHANGELOG.md | 30 +++++++++++++++++++---------- README.md | 10 +++++----- client/android/README.md | 8 ++++---- client/android/app/build.gradle.kts | 8 ++++---- client/android/gradle.properties | 2 +- client/android/settings.gradle | 2 +- client/dotnet/README.md | 4 ++-- server/README.md | 12 ++++++------ server/build.gradle.kts | 2 +- server/gradle.properties | 2 +- server/settings.gradle | 2 +- 11 files changed, 46 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f03db55..ffc3361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,17 @@ 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] - +### Changed +- Rename repository from `keyple-java-demo-remote` to `keyple-demo-ticketing-reloading-remote` +- Rename Android artifact from `keyple-demo-remote-client-android` to `keyple-demo-ticketing-reloading-client-android-app` +- Rename Server artifact from `keyple-demo-remote-server` to `keyple-demo-ticketing-reloading-server` +- Change `minSdk` from `24` -> `26` +### Upgraded +- keyple-demo-common-lib `2.0.1-SNAPSHOT` -> keyple-demo-ticketing-common-lib `2.0.2-SNAPSHOT` +- Keyple components + - keyple-service-java-lib `3.3.1` -> `3.3.3` + - keyple-card-calypso-java-lib `3.1.3` -> `3.1.4` + ## [2024.10.01] ### Upgraded - Keyple components @@ -111,12 +121,12 @@ New dependencies - `keyple-plugin-android-omapi-java-lib:2.0.1` - `keyple-util-java-lib:2.3.0` -[Unreleased]: https://github.com/calypsonet/keyple-java-demo-remote/compare/2024.10.01...HEAD -[2024.10.01]: https://github.com/calypsonet/keyple-java-demo-remote/compare/2024.09.20...2024.10.01 -[2024.09.20]: https://github.com/calypsonet/keyple-java-demo-remote/compare/2024.04.23...2024.09.20 -[2024.04.23]: https://github.com/calypsonet/keyple-java-demo-remote/compare/2023.12.06...2024.04.23 -[2023.12.06]: https://github.com/calypsonet/keyple-java-demo-remote/compare/2023.05.31...2023.12.06 -[2023.05.31]: https://github.com/calypsonet/keyple-java-demo-remote/compare/2023.03.03...2023.05.31 -[2023.03.03]: https://github.com/calypsonet/keyple-java-demo-remote/compare/2023.02.24...2023.03.03 -[2023.02.24]: https://github.com/calypsonet/keyple-java-demo-remote/compare/2022.11.18...2023.02.24 -[2022.11.18]: https://github.com/calypsonet/keyple-java-demo-remote/compare/v2021.11...2022.11.18 \ No newline at end of file +[Unreleased]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/2024.10.01...HEAD +[2024.10.01]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/2024.09.20...2024.10.01 +[2024.09.20]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/2024.04.23...2024.09.20 +[2024.04.23]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/2023.12.06...2024.04.23 +[2023.12.06]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/2023.05.31...2023.12.06 +[2023.05.31]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/2023.03.03...2023.05.31 +[2023.03.03]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/2023.02.24...2023.03.03 +[2023.02.24]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/2022.11.18...2023.02.24 +[2022.11.18]: https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/compare/v2021.11...2022.11.18 \ No newline at end of file diff --git a/README.md b/README.md index ffe8456..007b08a 100644 --- a/README.md +++ b/README.md @@ -20,15 +20,15 @@ using the Keyple SDK. ## Keyple Demos This demo is part of a set of three demos: -* [Keyple Reload Demo](https://github.com/calypsonet/keyple-java-demo-remote) -* [Keyple Validation Demo](https://github.com/calypsonet/keyple-android-demo-validation) -* [Keyple Control Demo](https://github.com/calypsonet/keyple-android-demo-control) +* [Keyple Reload Demo](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote) +* [Keyple Validation Demo](https://github.com/calypsonet/keyple-demo-ticketing-validation-app) +* [Keyple Control Demo](https://github.com/calypsonet/keyple-demo-ticketing-control-app) These demos are all based on a common library that defines elements such as constants and data structures implemented for the logic of the ticketing application: -[Keyple Demo Common Library](https://github.com/calypsonet/keyple-demo-common-lib). +[Keyple Demo Common Library](https://github.com/calypsonet/keyple-demo-ticketing-common-lib). -Please refer to the [README](https://github.com/calypsonet/keyple-demo-common-lib/blob/main/README.md) +Please refer to the [README](https://github.com/calypsonet/keyple-demo-ticketing-common-lib/blob/main/README.md) file of this library to discover these data structures. ## Code organization diff --git a/client/android/README.md b/client/android/README.md index 0ead78b..b845187 100644 --- a/client/android/README.md +++ b/client/android/README.md @@ -6,16 +6,16 @@ This demo is an open source project provided by the [Calypso Networks Associatio the [Eclipse Keyple SDK](https://keyple.org) in a typical use case that can serve as a basis for building a ticketing ecosystem based on contactless cards and/or NFC smartphones. -The source code and APK are available at [calypsonet/keyple-java-demo-remote/releases](https://github.com/calypsonet/keyple-java-demo-remote/releases) +The source code and APK are available at [calypsonet/keyple-demo-ticketing-reloading-remote/releases](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/releases) The code can be easily adapted to other cards, terminals and business logic. It shows how to load contracts into a Calypso card, the whole ticketing process being managed remotely. Following the contract loading the card can pay presented to a validator running the -[Keyple Demo Validation](https://github.com/calypsonet/keyple-android-demo-validation) application and then checked with -the [Keyple Demo Control](https://github.com/calypsonet/keyple-android-demo-control) application. +[Keyple Demo Validation](https://github.com/calypsonet/keyple-demo-ticketing-validation-app) application and then checked with +the [Keyple Demo Control](https://github.com/calypsonet/keyple-demo-ticketing-control-app) application. -Read the main [README](https://github.com/calypsonet/keyple-java-demo-remote#readme) to understand the purpose of this +Read the main [README](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote#readme) to understand the purpose of this application. ## Screens diff --git a/client/android/app/build.gradle.kts b/client/android/app/build.gradle.kts index a81c24a..cb72349 100644 --- a/client/android/app/build.gradle.kts +++ b/client/android/app/build.gradle.kts @@ -53,7 +53,7 @@ android { defaultConfig { applicationId = "org.calypsonet.keyple.demo.reload.remote" - minSdk = 24 + minSdk = 26 //noinspection ExpiredTargetSdkVersion targetSdk = 31 versionName = project.version.toString() @@ -116,17 +116,17 @@ android { dependencies { // Demo common - implementation("org.calypsonet.keyple:keyple-demo-common-lib:2.0.1-SNAPSHOT") { isChanging = true } + implementation("org.calypsonet.keyple:keyple-demo-ticketing-common-lib:2.0.2-SNAPSHOT") { isChanging = true } // Begin Keyple configuration (generated by 'https://keyple.org/components/overview/configuration-wizard/') implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") implementation("org.eclipse.keypop:keypop-calypso-card-java-api:2.1.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.3.1") + implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.3") implementation("org.eclipse.keyple:keyple-distributed-network-java-lib:2.5.1") implementation("org.eclipse.keyple:keyple-distributed-local-java-lib:2.5.1") - implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.3") + implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.4") implementation("org.eclipse.keyple:keyple-plugin-android-nfc-java-lib:2.2.0") implementation("org.eclipse.keyple:keyple-plugin-android-omapi-java-lib:2.1.0") // End Keyple configuration diff --git a/client/android/gradle.properties b/client/android/gradle.properties index 5df25ab..5e0f2c8 100644 --- a/client/android/gradle.properties +++ b/client/android/gradle.properties @@ -1,5 +1,5 @@ version = 2024.10.01 -archivesBaseName = keyple-demo-remote-client-android +archivesBaseName = keyple-demo-ticketing-reloading-client-android-app # Project-wide Gradle settings. # IDE (e.g. Android Studio) users: diff --git a/client/android/settings.gradle b/client/android/settings.gradle index 7e49066..1fd287f 100644 --- a/client/android/settings.gradle +++ b/client/android/settings.gradle @@ -1,3 +1,3 @@ -rootProject.name = "keyple-demo-remote-client-android" +rootProject.name = "keyple-demo-ticketing-reloading-client-android-app" include ':app' \ No newline at end of file diff --git a/client/dotnet/README.md b/client/dotnet/README.md index 3c029c5..904dffa 100644 --- a/client/dotnet/README.md +++ b/client/dotnet/README.md @@ -13,13 +13,13 @@ any application using the **Keyple Distributed JSON API**, whatever the operatin - C# (.NET 7.0) for Windows. - Command line interface. - PC/SC card reader interface. -- Connected to the [Java Server Application](https://github.com/calypsonet/keyple-java-demo-remote/tree/main/server). +- Connected to the [Java Server Application](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/tree/main/server). ## Operations ### Prerequisites 1. Build the C# client application using **Microsoft Visual Studio 2022**. 2. Make sure a PC/SC reader is connected. -3. Have a pre-personalized card (use the [Android Client Application](https://github.com/calypsonet/keyple-java-demo-remote/tree/main/client/android)) with at least one of these AIDs: +3. Have a pre-personalized card (use the [Android Client Application](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote/tree/main/client/android)) with at least one of these AIDs: - `A000000291FF9101`: Keyple Generic - `315449432E49434131`: CD Light GTML - `315449432E49434133`: Calypso Light diff --git a/server/README.md b/server/README.md index 4b347ad..6fc7839 100644 --- a/server/README.md +++ b/server/README.md @@ -4,16 +4,16 @@ This is the repository for the Java Server of the Keyple Reload Demo application The server is accessible from the client application and can be monitored via a GUI. -Read the main [README](https://github.com/calypsonet/keyple-java-demo-remote#readme) to understand the purpose of this +Read the main [README](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote#readme) to understand the purpose of this demo. ## Running the server from the executable JAR file -The server is packaged as an executable jar `keyple-demo-remote-server-X.Y.Z-full.jar` which can be started with the +The server is packaged as an executable jar `keyple-demo-ticketing-reloading-server-X.Y.Z-full.jar` which can be started with the command: ``` -java -jar keyple-demo-remote-server-X.Y.Z-full.jar +java -jar keyple-demo-ticketing-reloading-server-X.Y.Z-full.jar ``` A web browser should be launched automatically pointing to the server dashboard application. @@ -34,7 +34,7 @@ matching regex of your PC/SC reader. The command hereafter starts the server with the PCSC reader `Identive CLOUD 2700 R Smart Card Reader` ``` -java "-Dsam.pcsc.reader.filter=Identive CLOUD 2700 R Smart Card Reader.*" -jar keyple-demo-remote-server-X.Y.Z-full.jar +java "-Dsam.pcsc.reader.filter=Identive CLOUD 2700 R Smart Card Reader.*" -jar keyple-demo-ticketing-reloading-server-X.Y.Z-full.jar ``` - **For Windows Powershell:** @@ -42,7 +42,7 @@ java "-Dsam.pcsc.reader.filter=Identive CLOUD 2700 R Smart Card Reader.*" -jar k Beware of the syntax on Windows Powershell to pass an argument ``` -java '-Dsam.pcsc.reader.filter=Identive CLOUD 2700 R Smart Card Reader.*' -jar .\keyple-demo-remote-server-X.Y.Z-full.jar +java '-Dsam.pcsc.reader.filter=Identive CLOUD 2700 R Smart Card Reader.*' -jar .\keyple-demo-ticketing-reloading-server-X.Y.Z-full.jar ``` ## Running the server from the sources (for developers) @@ -72,4 +72,4 @@ You can now build and run the server: ./gradlew startServer ``` -The build command produces the `keyple-demo-remote-server-X.Y.Z-full.jar` JAR file in the `build` directory. +The build command produces the `keyple-demo-ticketing-reloading-server-X.Y.Z-full.jar` JAR file in the `build` directory. diff --git a/server/build.gradle.kts b/server/build.gradle.kts index edc2efc..8cd7746 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -41,7 +41,7 @@ java { dependencies { // Demo common - implementation("org.calypsonet.keyple:keyple-demo-common-lib:2.0.1-SNAPSHOT") { isChanging = true } + implementation("org.calypsonet.keyple:keyple-demo-ticketing-common-lib:2.0.2-SNAPSHOT") { isChanging = true } // Begin Keyple configuration (generated by 'https://keyple.org/components/overview/configuration-wizard/') implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") diff --git a/server/gradle.properties b/server/gradle.properties index c21a2d2..d2b466a 100644 --- a/server/gradle.properties +++ b/server/gradle.properties @@ -1,7 +1,7 @@ # don't forget to keep the version string in server/dashboard-app/src/package.json synchronized with the following version = 2024.10.01 title = "Keyple Reload Demo - Remote Server" -archivesBaseName = keyple-demo-remote-server +archivesBaseName = keyple-demo-ticketing-reloading-server javaSourceLevel = 1.8 javaTargetLevel = 1.8 diff --git a/server/settings.gradle b/server/settings.gradle index fd3ac60..f15f668 100644 --- a/server/settings.gradle +++ b/server/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = "keyple-demo-remote-server" +rootProject.name = "keyple-demo-ticketing-reloading-server" // Fix resolution of dependencies with dynamic version in order to use SNAPSHOT first when available. // See explanation here: https://docs.gradle.org/6.8.3/userguide/single_versions.html