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

Feat/androidnfc plugin update #265

Merged
merged 27 commits into from Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8c837a9
Feat: Added Gradlew Wrapper for example App
ocfmem Feb 14, 2020
6381772
Refact: Gradle files.
ocfmem Feb 14, 2020
bae3007
Refact: Java to Kotlin
ocfmem Feb 17, 2020
69b2710
Refact: Updating Android NFC Exampele app
ocfmem Feb 18, 2020
c6ad8f9
Refact: Exemple App
ocfmem Feb 25, 2020
046e509
Fix: Fixed and improved Unit Tests
ocfmem Feb 27, 2020
88ce715
Fix: Ignoring apply plugin: 'org.eclipse.keyple' for now in android k…
ocfmem Mar 2, 2020
2e281fb
Feat: Improve SE REmoved from field for Android >= 7
ocfmem Mar 3, 2020
51e6d5a
Feat: Added Binding for slf4j with Timber
ocfmem Mar 3, 2020
603cd40
Refact: Removed fragment xml from omapi example app
ocfmem Mar 3, 2020
41cad63
Feat: Improvement of UI of example app
ocfmem Mar 3, 2020
e653246
Fix: Code format
ocfmem Mar 4, 2020
4d192b4
Fix: Conflict between IDE Optimize imports ans Spotless
ocfmem Mar 4, 2020
29402d5
Fix: logging issue with SeSelector.AidSelector usint AidToSelect = null
ocfmem Mar 4, 2020
b29e8f3
Fix: logging issue with SeSelector.AidSelector usint AidToSelect = null
ocfmem Mar 4, 2020
376bc77
Fix: Spotless Java
ocfmem Mar 4, 2020
12ab504
Fix: KEYP-26 crash on NFC Example App
ocfmem Mar 5, 2020
4eba98e
Fix: KEYP-35 Improving SE presence check in example app.
ocfmem Mar 5, 2020
5e3ff1e
Feat: Improved Javadoc
ocfmem Mar 11, 2020
29ae4bc
Fix: Spotless issue
ocfmem Mar 11, 2020
e318b88
Refact: Renaming main activity to calypso activity
ocfmem Mar 16, 2020
9e54398
Feat: Added Core Examples
ocfmem Mar 16, 2020
43dca9e
Feat: Test coverage improvement
ocfmem Mar 17, 2020
70df0ff
Feat: Test coverage improvement
ocfmem Mar 17, 2020
6aadb93
Fix: Comments issues
ocfmem Mar 19, 2020
375594d
Fix: Updating gradlew wrapper version for example app
eclipsewebmaster Mar 19, 2020
c786cf5
Fix: Completed ReleaseNotes.md
ocfmem Mar 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions NOTICE.md
Expand Up @@ -78,6 +78,10 @@ Android Open Source Project
Timber (4.7.1):

* Licence: Apache Software License, 2.0

slf4j Timber (3.1):

* Licence: Apache Software License, 2.0

Mockk (1.9):

Expand Down
65 changes: 30 additions & 35 deletions android/keyple-plugin/android-nfc/build.gradle
@@ -1,21 +1,25 @@
apply from: "../../build.gradle"

apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'org.eclipse.keyple'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
//apply plugin: 'org.eclipse.keyple'

archivesBaseName = "keyple-android-plugin-nfc"

project.group 'org.eclipse.keyple'
group 'org.eclipse.keyple'
project.description = 'Keyple Plugin Android Nfc'

android {
compileSdkVersion 26
buildToolsVersion '26.0.3'
compileSdkVersion 29
buildToolsVersion '29.0.2'

defaultConfig {
minSdkVersion 19
targetSdkVersion 26
targetSdkVersion 29
versionName project.version
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
Expand All @@ -30,7 +34,10 @@ android {
}

testOptions {
unitTests.returnDefaultValues = true//mock Log Android object
unitTests {
returnDefaultValues = true//mock Log Android object
includeAndroidResources = true
}
}


Expand Down Expand Up @@ -80,24 +87,14 @@ android {

}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'
}

}

//build javadoc
task javadoc(type: Javadoc) {
failOnError false
source = android.sourceSets.main.java.sourceFiles
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
classpath += configurations.compile
}

// build a jar with javadoc
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}

//build source jar
//build sources jar
task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.sourceFiles
Expand Down Expand Up @@ -212,26 +209,24 @@ dependencies {
implementation group: 'org.eclipse.keyple', name: 'keyple-java-core', version: project.version

//android
implementation "com.android.support:support-v4:${android_support_version}"
implementation "com.android.support:appcompat-v7:${android_support_version}"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'

//logging
implementation "org.slf4j:slf4j-api:${slf4japi_version}"

implementation "org.slf4j:slf4j-api:1.7.25"
implementation 'com.jakewharton.timber:timber:4.7.1' //Android
implementation 'com.arcao:slf4j-timber:3.1@aar' //SLF4J binding for Timber

/*
Tests
*/
/** Test **/
testImplementation "junit:junit:4.12"

testImplementation "junit:junit:${junit_version}"

/**Power mock**/
androidTestImplementation "org.mockito:mockito-android:${mockito_android_version}"
androidTestImplementation "org.powermock:powermock-api-mockito:${powermock_version}"
androidTestImplementation "org.powermock:powermock-module-junit4:${powermock_version}"
/** Mocking for tests **/
testImplementation "io.mockk:mockk:1.9"

testImplementation "org.powermock:powermock-api-mockito:${powermock_version}"
testImplementation "org.powermock:powermock-module-junit4:${powermock_version}"
/**End of power mock **/
/** Allow to use Android SDK in JVM */
testImplementation 'org.robolectric:robolectric:4.3.1'

}

This file was deleted.

This file was deleted.