Skip to content
This repository has been archived by the owner on Sep 13, 2022. It is now read-only.

feat/omapi_plugin_update #263

Merged
merged 7 commits into from Feb 18, 2020
Merged

feat/omapi_plugin_update #263

merged 7 commits into from Feb 18, 2020

Conversation

ocfmem
Copy link
Contributor

@ocfmem ocfmem commented Feb 11, 2020

Replace feat/se_omapi_plugin

Signed-off-by: Meddy Menzikoff m.menzikoff@oneclickflare.fr

@ocfmem ocfmem changed the title Squashed commit of the following: feat/omapi_plugin_update Feb 11, 2020
@eclipse-keyple-bot
Copy link

Can one of the admins verify this patch?

@odelcroi
Copy link
Contributor

retest this please

@pterr pterr assigned pterr and ocfmem and unassigned pterr Feb 12, 2020
@pterr pterr self-requested a review February 12, 2020 08:08
pterr
pterr suggested changes Feb 12, 2020
View reviewed changes
Copy link
Contributor

@pterr pterr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In android/build.gradle, I let Olivier and Brice validate the change of the gradle version 3.0.1 to 3.14.0 and of the gradle plugin version from 3.14.0 to 3.27.1.

In android/keyple-plugin/android-omapi/build.gradle, sourceCompatibility & targetCompatibility have been switched from the value JavaVersion.VERSION_1_6 to JavaVersion.VERSION_1_8.
The Keyple plugins are supposed to be compliant with Android 4.4 (API level 19). Is it still the case? Should we keep the targetCompatibility at JavaVersion.VERSION_1_6?

I think that the plugin defined in PluginName.kt could be directly include in AndroidOmapiPlugin.kt

The log API android.util.Log has been replaced by timber.log.Timber. So, a new API dependency is introduced: we will have to validate it with the Eclipse foundation, and we also have to mention it in the file NOTICE.md at the raw of the repository, in the section Third-party Content (https://github.com/eclipse/keyple-java/blob/develop/NOTICE.md#third-party-content).
To have the same convention naming as the rest of the Keyple API:

  • I propose to rename AndroidOmapiPlugin.kt AbstractAndroidOmapiPlugin.kt, and AndroidOmapiReader.kt to AbstractAndroidOmapiReader.kt, so in the 'se' & 'simalliance' we could rename also AndroidOmapiPluginImpl.kt as AndroidOmapiPlugin.kt and AndroidOmapiReader.kt.

  • The interface ISeServiceFactory.kt could be renamed to SeServiceFactory.kt too.

Some JavaDoc improments required:

  • in org.eclipse.keyple.plugin.android.omapi.ISeServiceFactory<T, V> could you add an explanation on the role & usage of this interface.
  • simalliance/AndroidOmapiPluginImpl.kt just add a comment to explain that this interface makes the link with the SIM Alliance implementation of OMAPI
  • se/AndroidOmapiPluginImpl.kt just add a comment to explain that this interface makes the link with the native OMAPI implementation of Android 9.0.

Can you update the ReleaseNotes file at the raw of the repository, in the section keyple-android-plugin-android-omapi 0.9a (https://github.com/eclipse/keyple-java/blob/develop/ReleaseNotes.md#keyple-android-plugin-android-omapi-09a) to explain the evolution provided by this contribution: conversion of the Java code to Kotlin, OMAPI compliance improvement to the SIM Alliance OMAPI implementation and to the Android 9.0 native OMAPI implementation.

Maybe some settings of the example keyple-java/java/example/calypso/android/omapi/ could be more factorized with those defined in keyple-java/java/example/common/.

@ocfmem
Squashed commit of the following:
2b5bebf 
commit 0c4c154
Merge: 8d00675 65e988e
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Feb 11 18:17:54 2020 +0100

    Merge remote-tracking branch 'origin/feat/se_omapi_plugin' into feat/se_omapi_plugin

commit 8d00675
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Feb 11 18:06:50 2020 +0100

    Refact: Customing events

    Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>

commit b4bd517
Merge: 30bb716 82ca1a5
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Feb 11 17:56:03 2020 +0100

    Merge remote-tracking branch 'origin/feat/se_omapi_plugin' into feat/se_omapi_plugin

commit 82ca1a5
Merge: f277007 7b22565
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 11 17:43:09 2020 +0100

    Merge remote-tracking branch 'origin/feat/se_omapi_plugin' into feat/se_omapi_plugin

commit 30bb716
Merge: f277007 7b22565
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 11 17:43:09 2020 +0100

    Spotless Fixes

    Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>

commit f277007
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 11 13:19:35 2020 +0100

    Spotless Fixes

    Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>

commit 65e988e
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Feb 11 18:06:50 2020 +0100

    Refact: Customing events

    Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>

commit 6d14a95
Merge: 86412c2 489ca2e
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Feb 11 17:56:03 2020 +0100

    Merge remote-tracking branch 'origin/feat/se_omapi_plugin' into feat/se_omapi_plugin

commit 86412c2
Merge: e453cdb 7b22565
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 11 17:43:09 2020 +0100

    Spotless Fixes

    Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>

commit 489ca2e
Merge: e453cdb 7b22565
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 11 17:43:09 2020 +0100

    Merge remote-tracking branch 'origin/feat/se_omapi_plugin' into feat/se_omapi_plugin

commit e453cdb
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 11 13:19:35 2020 +0100

    Spotless Fixes

    Signed-off-by: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>

commit 7b22565
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 11 13:19:35 2020 +0100

    Fixed: Issue on Calypso Examples

commit aeb6510
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 11 12:09:46 2020 +0100

    Refact: Spotless Fixes

commit a52c712
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Mon Feb 10 17:47:24 2020 +0100

    Feat: Added read env and usage for hoplink example

commit c7acdff
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Mon Feb 10 17:22:45 2020 +0100

    Refact: Improved UI

commit 96eef8f
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Mon Feb 10 16:03:08 2020 +0100

    Refact: Customing events

commit 89a9b3c
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Mon Feb 10 14:44:52 2020 +0100

    Feat: Added more core Examples

commit 2c8da86
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 4 17:08:43 2020 +0100

    Refact: Cleaning and warning fix

commit a5b84a4
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 4 13:49:46 2020 +0100

    Fixed: Visibility issue

commit aff676b
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 4 13:01:13 2020 +0100

    Feat: Updated gradle and Kotlin versions

commit 1344801
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Tue Feb 4 12:32:43 2020 +0100

    Feat: Config for spotless header check

commit 0259f8c
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Mon Feb 3 16:50:14 2020 +0100

    Feat: Added Spotless
    Refact: Formated to match kLint

commit 3e9d91f
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Mon Feb 3 16:01:25 2020 +0100

    Added Dokka for Kotlin Doc

commit 346f728
Author: Meddy Menzikoff <6243718+ocfmem@users.noreply.github.com>
Date:   Mon Feb 3 15:31:53 2020 +0100

    Removed variables versions from gradle.properties

commit e6d088f
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Fri Jan 31 14:10:26 2020 +0100

    Feat: Added Gradle wrapper for Example app

commit 170340a
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Fri Jan 31 12:29:23 2020 +0100

    Feat: Added exemple use case

commit 6023145
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Thu Jan 30 13:44:38 2020 +0100

    Added new screens for core and calypso examples

commit c516d93
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Wed Jan 29 16:32:54 2020 +0100

    Refact: Demo app, step to kotlin and new features

commit df97fff
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Jan 28 12:13:54 2020 +0100

    Update Gradle version
    Added Kotlin support

commit e37f473
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Jan 28 10:59:56 2020 +0100

    Fixed omapi dependencie

commit 6c6945b
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Fri Jan 24 17:45:01 2020 +0100

    Improved Test coverage

commit eb318b7
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Thu Jan 23 17:58:08 2020 +0100

    Improved test coverage
    Switched from Powermock and Mockito to Mockk

commit 646e5f8
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Wed Jan 22 18:29:50 2020 +0100

    Improved test coverage

commit ba0a9f5
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Wed Jan 22 14:09:55 2020 +0100

    Reorganizing kotlin sources
    Added reading of another container in example

commit 8c3cde2
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Fri Jan 17 17:05:41 2020 +0100

    Cleaning

commit 07508eb
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Fri Jan 17 17:03:26 2020 +0100

    Improvement of p2 test

commit bab209b
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Fri Jan 17 16:59:36 2020 +0100

    Refactored
    Fixed openLogicalChannel issue with OMAPI < 3

commit 12791f5
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Fri Jan 17 12:23:44 2020 +0100

    Added signing config for keystore registered with container

commit 91537bb
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Thu Jan 16 11:54:55 2020 +0100

    Factoring OMAPIs plugins
    Added Timber
    Fixed crash of demo app

commit 07ec57d
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Jan 14 14:32:49 2020 +0100

    Refactoring

commit 68b513f
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Tue Jan 14 11:23:31 2020 +0100

    Connexion to SEs done

commit 117007b
Author: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
Date:   Fri Jan 10 14:38:46 2020 +0100

    Upgrading sdk compile and target versions
    Dropped and support libs to AndroidX
    Added Kotlin support

Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
@ocfmem
Fixed: Naming convention
863e56a 
Refact: Moved PLUGIN_NAME constant to AbstractAndroidOmapiPlugin

Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
@ocfmem
Fix: Updated Dependencies declaration
7ea33b7 
Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
@ocfmem
Fixed: Improvement of Javadoc
b83924d 
Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
@ocfmem
Feat: Changes added to ReleaseNotes.md
e0d8d2e 
Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
@ocfmem
Fixed: Rolleback sourceCompatibility and targetCompatibility to 1.6
8de635a 
Feat: Updated core-ktx to 1.2.0

Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
@ocfmem
Copy link
Contributor Author

ocfmem commented Feb 12, 2020

@pterr I have updated the project as you suggested on most elements.
Switched back source and target compatibility to 1.6, to be compliant with the project java source code. But as plugin is now using Kotlin, it's the Kotlin bytecode generator that handle compatibility with old Android Version as far as I know.
I hade to force push because I rebased last changes from eclipse/keyple-java to retrieve last version of ReleaseNote.md

@ocfmem
Copy link
Contributor Author

ocfmem commented Feb 12, 2020

retest this please

@ocfmem ocfmem requested a review from pterr February 12, 2020 16:21
@odelcroi
Copy link
Contributor

retest this please

@ocfmem
Fix: Added version of android dependencies in NOTICE.md
97104f2 
Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
pterr
pterr approved these changes Feb 18, 2020
View reviewed changes
Copy link
Contributor

@pterr pterr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@pterr pterr merged commit 2b5f614 into eclipse-keyple:develop Feb 18, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@pterr pterr pterr approved these changes

@odelcroi odelcroi Awaiting requested review from odelcroi

@jeanpierrefortune jeanpierrefortune Awaiting requested review from jeanpierrefortune

Assignees

@ocfmem ocfmem

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ocfmem @eclipse-keyple-bot @odelcroi @pterr