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.

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

refact: rename repositories #31

Merged
merged 3 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 19 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -31,18 +39,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Other components (Gradle wrapper, Android Gradle Plugin, etc.)

## [2023.12.06]
### Added
New dependencies
- Keypop Crypto Legacy SAM API `0.3.0`
- Keyple Calypso Crypto LegacySAM Library `0.4.0`
### Upgraded
- Calypsonet Terminal Reader API `1.3.0` -> Keypop Reader API `2.0.0`
- Calypsonet Terminal Calypso API `1.8.0` -> Keypop Calypso Card API `2.0.0`
- Keyple Service Library `2.3.1` -> `3.0.1`
- Keyple Calypso Card Library `2.3.5` -> `3.0.1`
- Keyple Util Library `2.3.0` -> `2.3.1`

### Added
New dependencies
- Keypop Crypto Legacy SAM API `0.3.0`
- Keyple Calypso Crypto LegacySAM Library `0.4.0`

## [2023.06.01]
### Upgraded
- `keyple-demo-common-lib:2.0.0-SNAPSHOT`
Expand Down Expand Up @@ -82,10 +89,10 @@ 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-control/compare/2024.09.20...HEAD
[2024.09.20]: https://github.com/calypsonet/keyple-android-demo-control/compare/2024.04.23...2024.09.20
[2024.04.23]: https://github.com/calypsonet/keyple-android-demo-control/compare/2023.12.06...2024.04.23
[2023.12.06]: https://github.com/calypsonet/keyple-android-demo-control/compare/2023.06.01...2023.12.06
[2023.06.01]: https://github.com/calypsonet/keyple-android-demo-control/compare/2023.02.24...2023.06.01
[2023.02.24]: https://github.com/calypsonet/keyple-android-demo-control/compare/2022.11.18...2023.02.24
[2022.11.18]: https://github.com/calypsonet/keyple-android-demo-control/compare/v2021.11...2022.11.18
[Unreleased]: https://github.com/calypsonet/keyple-demo-ticketing-control-app/compare/2024.09.20...HEAD
[2024.09.20]: https://github.com/calypsonet/keyple-demo-ticketing-control-app/compare/2024.04.23...2024.09.20
[2024.04.23]: https://github.com/calypsonet/keyple-demo-ticketing-control-app/compare/2023.12.06...2024.04.23
[2023.12.06]: https://github.com/calypsonet/keyple-demo-ticketing-control-app/compare/2023.06.01...2023.12.06
[2023.06.01]: https://github.com/calypsonet/keyple-demo-ticketing-control-app/compare/2023.02.24...2023.06.01
[2023.02.24]: https://github.com/calypsonet/keyple-demo-ticketing-control-app/compare/2022.11.18...2023.02.24
[2022.11.18]: https://github.com/calypsonet/keyple-demo-ticketing-control-app/compare/v2021.11...2022.11.18
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-control](https://github.com/calypsonet/keyple-android-demo-control) repository
2. Clone repository: `git clone https://github.com/[your_github_username]/keyple-android-demo-control.git`
1. [Fork](https://help.github.com/articles/fork-a-repo/) the [calypsonet/keyple-demo-ticketing-control-app](https://github.com/calypsonet/keyple-demo-ticketing-control-app) repository
2. Clone repository: `git clone https://github.com/[your_github_username]/keyple-demo-ticketing-control-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`
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ 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-control/releases](https://github.com/calypsonet/keyple-android-demo-control/releases)
The source code and APK are available at [calypsonet/keyple-demo-ticketing-control-app/releases](https://github.com/calypsonet/keyple-demo-ticketing-control-app/releases)

The code can be easily adapted to other cards, terminals and business logic.

It shows how to easily control a card following a validation performed with the [Keyple Demo Validation](https://github.com/calypsonet/keyple-android-demo-validation)
It shows how to easily control a card following a validation performed with the [Keyple Demo Validation](https://github.com/calypsonet/keyple-demo-ticketing-validation-app)
application (entry into the transportation network with a Season Pass and/or Multi-trip ticket).
The contracts being updated in the Calypso card with the Android application of the [Keyple Reload Demo package](https://github.com/calypsonet/keyple-java-demo-remote).
The contracts being updated 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).
Expand All @@ -31,14 +31,14 @@ the case when the application is launched on a standard smartphone).
## 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.

## Control Procedure
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ android {

defaultConfig {
applicationId = "org.calypsonet.keyple.demo.control"
minSdk = 24
minSdk = 26
//noinspection ExpiredTargetSdkVersion
targetSdk = 31
versionName = project.version.toString()
Expand Down Expand Up @@ -117,7 +117,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"))))
Expand All @@ -128,8 +128,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
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = 2024.09.20
archivesBaseName = keyple-android-demo-control
archivesBaseName = keyple-demo-ticketing-control-app

# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rootProject.name = "keyple-android-demo-control"
rootProject.name = "keyple-demo-ticketing-control-app"

include ':app'
Loading