refact: rename repositories (#27)

calypsonet · Oct 16, 2024 · c337026 · c337026
1 parent 9ca0b34
commit c337026
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 24 deletions.
diff --git 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]
+### Changed
+- Rename repository and artifact from `keyple-android-demo-control` to `keyple-demo-ticketing-control-app`
+- 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.09.20]
 ### Fixed
@@ -85,11 +93,11 @@ New dependencies
 - `keyple-plugin-cna-flowbird-android-java-lib-2.0.2-mock` (mocked library)
 - `keyple-util-java-lib:2.3.0`
 
-[Unreleased]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2024.09.20...HEAD
-[2024.09.20]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2024.04.23...2024.09.20
-[2024.04.23]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2023.12.06...2024.04.23
-[2023.12.06]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2023.06.01...2023.12.06
-[2023.06.01]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2023.03.03...2023.06.01
-[2023.03.03]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2023.02.24...2023.03.03
-[2023.02.24]: https://github.com/calypsonet/keyple-android-demo-validation/compare/2022.11.18...2023.02.24
-[2022.11.18]: https://github.com/calypsonet/keyple-android-demo-validation/compare/v2021.11...2022.11.18
+[Unreleased]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2024.09.20...HEAD
+[2024.09.20]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2024.04.23...2024.09.20
+[2024.04.23]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2023.12.06...2024.04.23
+[2023.12.06]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2023.06.01...2023.12.06
+[2023.06.01]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2023.03.03...2023.06.01
+[2023.03.03]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2023.02.24...2023.03.03
+[2023.02.24]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/2022.11.18...2023.02.24
+[2022.11.18]: https://github.com/calypsonet/keyple-demo-ticketing-validation-app/compare/v2021.11...2022.11.18
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,8 +4,8 @@ Thanks for your interest in this project.
 
 ## Contributing
 
-1. [Fork](https://help.github.com/articles/fork-a-repo/) the [calypsonet/keyple-android-demo-validation](https://github.com/calypsonet/keyple-android-demo-validation) repository
-2. Clone repository: `git clone https://github.com/[your_github_username]/keyple-android-demo-validation.git`
+1. [Fork](https://help.github.com/articles/fork-a-repo/) the [calypsonet/keyple-demo-ticketing-validation-app](https://github.com/calypsonet/keyple-demo-ticketing-validation-app) repository
+2. Clone repository: `git clone https://github.com/[your_github_username]/keyple-demo-ticketing-validation-app.git`
 3. Create your feature branch: `git checkout -b my-new-feature`
 4. Make your changes
 5. Commit your changes: `git commit -m "Add some feature" -s`

diff --git a/README.md b/README.md
@@ -6,14 +6,14 @@ 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-android-demo-validation/releases](https://github.com/calypsonet/keyple-android-demo-validation/releases)
+The source code and APK are available at  [calypsonet/keyple-demo-ticketing-validation-app/releases](https://github.com/calypsonet/keyple-demo-ticketing-validation-app/releases)
 
 The code can be easily adapted to other cards, terminals and business logic.
 
 It shows how to check if a card is authorized to enter a controlled area (entering the transport network with
 a Season Pass and/or Multi-trip ticket), a validation event is added in the event log to be checked by the
-[Keyple Demo Control](https://github.com/calypsonet/keyple-android-demo-control)  application.
-The contracts are loaded in the Calypso card with the Android application of the [Keyple Reload Demo package](https://github.com/calypsonet/keyple-java-demo-remote).
+[Keyple Demo Control](https://github.com/calypsonet/keyple-demo-ticketing-control-app)  application.
+The contracts are loaded in the Calypso card with the Android application of the [Keyple Reload Demo package](https://github.com/calypsonet/keyple-demo-ticketing-reloading-remote).
 
 The demo application was tested on the following terminals:
 - `Famoco FX205` via the open source plugins [Famoco](https://github.com/calypsonet/keyple-famoco) (for SAM access) and [Android NFC](https://keyple.org/components-java/plugins/nfc/) (for card access).
@@ -28,14 +28,14 @@ As all the exchanges made with the card are cryptographically secured by a secur
 ## 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).
+for the logic of the ticketing application: [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.
 
 ## Validation Procedure

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -53,7 +53,7 @@ android {
 
     defaultConfig {
         applicationId = "org.calypsonet.keyple.demo.validation"
-        minSdk = 24
+        minSdk = 26
         //noinspection ExpiredTargetSdkVersion
         targetSdk = 31
         versionName = project.version.toString()
@@ -116,7 +116,7 @@ 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 }
 
     // Keyple reader plugins proprietary libs
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))
@@ -127,8 +127,8 @@ 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.3.1")
-    implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.3")
+    implementation("org.eclipse.keyple:keyple-service-java-lib:3.3.3")
+    implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.4")
     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
@@ -1,5 +1,5 @@
 version = 2024.09.20
-archivesBaseName = keyple-android-demo-validation
+archivesBaseName = keyple-demo-ticketing-validation-app
 
 # Project-wide Gradle settings.
 # IDE (e.g. Android Studio) users:

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
-rootProject.name = "keyple-android-demo-validation"
+rootProject.name = "keyple-demo-ticketing-validation-app"
 
 include ':app'