feat: upgrade dependencies (#21)

--------- Co-authored-by: Andrei Cristea <[email protected]>
calypsonet · Apr 23, 2024 · 0d17cae · 0d17cae
1 parent bb3b1f7
commit 0d17cae
Show file tree

Hide file tree

Showing 34 changed files with 978 additions and 731 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,24 @@ 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]
+### Upgraded
+- keyple-demo-common-lib `2.0.0-SNAPSHOT` -> `2.0.1-SNAPSHOT`
+- All Keyple components (compiled to java 8)
+    - keypop-reader-java-api `2.0.0` -> `2.0.1`
+    - keypop-calypso-card-java-api `2.0.0` -> `2.1.0`
+    - keypop-calypso-crypto-legacysam-java-api `0.3.0` -> `0.6.0`
+    - keyple-common-java-api `2.0.0` -> `2.0.1`
+    - keyple-util-java-lib `2.3.1` -> `2.4.0`
+    - keyple-service-java-lib `3.0.1` -> `3.2.1`
+    - keyple-distributed-network-java-lib `2.3.0` -> `2.3.1`
+    - keyple-distributed-local-java-lib `2.3.0` -> `2.3.1`
+    - keyple-distributed-local-java-lib `2.3.0` -> `2.3.1`
+    - keyple-card-calypso-java-lib `3.0.1` -> `3.1.1`
+    - keyple-card-calypso-crypto-legacysam-java-lib `0.4.0` -> `0.7.0`
+    - keyple-plugin-android-nfc-java-lib `2.0.1` -> `2.2.0`
+    - keyple-plugin-android-omapi-java-lib `2.0.1` -> `2.1.0`
+    - keyple-plugin-pcsc-java-lib `2.1.2` -> `2.2.1`
+- Other components (Gradle wrapper, Android Gradle Plugin, etc.)
 
 ## [2023.12.06]
 ### Upgraded

diff --git a/client/android/app/build.gradle.kts b/client/android/app/build.gradle.kts
@@ -5,7 +5,7 @@ import java.util.Properties
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    kotlin("android.extensions")
+    id("kotlin-parcelize")
     kotlin("kapt")
     id("com.diffplug.spotless")
 }
@@ -17,9 +17,24 @@ val kotlinVersion: String by project
 val archivesBaseName: String by project
 val signingPropertiesFile = File("signing.properties")
 android {
-    compileSdkVersion(29)
-    buildToolsVersion("30.0.3")
-
+    /**
+     * The app's namespace. Used primarily to access app resources.
+     */
+    namespace = "org.calypsonet.keyple.demo.reload.remote"
+
+    /**
+     * compileSdk specifies the Android API level Gradle should use to
+     * compile your app. This means your app can use the API features included in
+     * this API level and lower.
+     */
+    compileSdk = 34
+
+    /**
+     * The defaultConfig block encapsulates default settings and entries for all
+     * build variants and can override some attributes in main/AndroidManifest.xml
+     * dynamically from the build system. You can configure product flavors to override
+     * these values for different versions of your app.
+     */
     signingConfigs {
         create("default") {
             // If the application has to be signed, the elements necessary for this operation
@@ -37,16 +52,17 @@ android {
     }
 
     defaultConfig {
-        applicationId("org.calypsonet.keyple.demo.remote")
-        minSdkVersion(21)
-        targetSdkVersion(29)
-        versionCode(6)
-        versionName(project.version.toString())
+        applicationId = "org.calypsonet.keyple.demo.reload.remote"
+        minSdk = 24
+        //noinspection ExpiredTargetSdkVersion
+        targetSdk = 31
+        versionCode = 6
+        versionName = project.version.toString()
     }
 
     buildTypes {
         getByName("release") {
-            minifyEnabled(false)
+            isMinifyEnabled = true // Enables code shrinking for the release build type.
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -60,21 +76,19 @@ android {
     val javaSourceLevel: String by project
     val javaTargetLevel: String by project
     compileOptions {
-        // Flag to enable support for the new language APIs
-        isCoreLibraryDesugaringEnabled  = true
         sourceCompatibility = JavaVersion.toVersion(javaSourceLevel)
         targetCompatibility = JavaVersion.toVersion(javaTargetLevel)
     }
 
+    kotlinOptions {
+        jvmTarget = javaTargetLevel
+    }
+
     packagingOptions {
         exclude("META-INF/NOTICE.md")
         exclude("META-INF/plugin_release.kotlin_module")
     }
 
-    kotlinOptions {
-        jvmTarget = javaTargetLevel
-    }
-
     lintOptions {
         isAbortOnError = false
     }
@@ -88,65 +102,69 @@ android {
         }
     }
 
+    /**
+     * Build Features Configuration
+     */
+    buildFeatures {
+        viewBinding = true
+    }
+
     sourceSets {
         getByName("main").java.srcDirs("src/main/kotlin")
     }
 }
 
 dependencies {
     // Demo common
-    implementation("org.calypsonet.keyple:keyple-demo-common-lib:2.0.0-SNAPSHOT") { isChanging = true }
-
-    // Keyple core
-    implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.0")
-    implementation("org.eclipse.keypop:keypop-calypso-card-java-api:2.0.0")
-    implementation("org.eclipse.keyple:keyple-common-java-api:2.0.0")
-    implementation("org.eclipse.keyple:keyple-util-java-lib:2.3.1")
-    implementation("org.eclipse.keyple:keyple-service-java-lib:3.0.1")
-    implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.0.1")
-
-    // Keyple reader plugins
-    implementation("org.eclipse.keyple:keyple-plugin-android-nfc-java-lib:2.0.1")
-    implementation("org.eclipse.keyple:keyple-plugin-android-omapi-java-lib:2.0.1")
-
-    // Keyple distributed
-    implementation("org.eclipse.keyple:keyple-distributed-network-java-lib:2.3.0")
-    implementation("org.eclipse.keyple:keyple-distributed-local-java-lib:2.3.0")
+    implementation("org.calypsonet.keyple:keyple-demo-common-lib:2.0.1-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.2.1")
+    implementation("org.eclipse.keyple:keyple-distributed-network-java-lib:2.3.1")
+    implementation("org.eclipse.keyple:keyple-distributed-local-java-lib:2.3.1")
+    implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:3.1.1")
+    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
 
     // Network
-    implementation("org.java-websocket:Java-WebSocket:1.3.9")
+    implementation("org.java-websocket:Java-WebSocket:1.5.5")
 
     // Retrofit
-    implementation("com.squareup.retrofit2:retrofit:2.4.0")
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.retrofit2:converter-gson:2.4.0")
     implementation("com.squareup.retrofit2:converter-scalars:2.4.0")
     implementation("com.squareup.retrofit2:adapter-rxjava2:2.4.0")
     implementation("com.squareup.okhttp3:logging-interceptor:3.9.1")
 
     // WorkManager
-    implementation("androidx.work:work-runtime-ktx:2.5.0")
+    implementation("androidx.work:work-runtime-ktx:2.9.0")
     implementation("org.greenrobot:eventbus:3.2.0") // to easily handle server status change
 
     // Android components
-    implementation("androidx.appcompat:appcompat:1.2.0")
-    implementation("com.google.android.material:material:1.3.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.2")
-    implementation("androidx.activity:activity-ktx:1.2.1")
-    implementation("androidx.fragment:fragment-ktx:1.3.1")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.10.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.activity:activity-ktx:1.8.1")
+    implementation("androidx.fragment:fragment-ktx:1.6.2")
 
     // Log
     implementation("org.slf4j:slf4j-api:1.7.32")
-    implementation("com.jakewharton.timber:timber:4.7.1")
+    implementation("com.jakewharton.timber:timber:5.0.1")
     implementation("com.arcao:slf4j-timber:3.1@aar") //SLF4J binding for Timber
 
     // Kotlin
-    implementation("androidx.core:core-ktx:1.3.2")
+    implementation("androidx.core:core-ktx:1.12.0")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
 
     // Coroutines
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
 
     implementation("androidx.multidex:multidex:2.0.1")
 
@@ -162,10 +180,6 @@ dependencies {
         exclude(group = "org.slf4j")
     }
 
-    implementation("org.slf4j:slf4j-api:1.7.32")
-    implementation("com.jakewharton.timber:timber:4.7.1") //Android
-    implementation("com.arcao:slf4j-timber:3.1@aar") //SLF4J binding for Timber
-
     // Dagger dependencies
     kapt("com.google.dagger:dagger-compiler:2.19")
     annotationProcessor("com.google.dagger:dagger-compiler:2.19")

diff --git a/client/android/app/src/androidTest/AndroidManifest.xml b/client/android/app/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
+            android:exported="false"/>
+        <activity android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
+            android:exported="false"/>
+        <activity android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
+            android:exported="false"/>
+    </application>
+</manifest>