Merge branch 'eu-digital-identity-wallet:main' into feat/add_transaction_data_to_request_screen

Author: stzouvaras

build-logic/convention/src/main/kotlin/project/convention/logic/KotlinAndroid.kt

@@ -20,8 +20,12 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.tasks.testing.Test
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JavaToolchainService
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.provideDelegate
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -110,4 +114,13 @@ private fun Project.configureKotlin() {
             )
         }
     }
+
+    val toolchains = extensions.getByType<JavaToolchainService>()
+    tasks.withType<Test>().configureEach {
+        javaLauncher.set(
+            toolchains.launcherFor {
+                languageVersion.set(JavaLanguageVersion.of(21))
+            }
+        )
+    }
 }

fastlane/README.md

@@ -29,7 +29,7 @@ Runs all the unit tests
 [bundle exec] fastlane android deploy
 ```
 
-Build Wallet and upload it to appcenter
+Build & Deploy Wallet
 
 ### android prepare_binary
 

gradle.properties

@@ -13,9 +13,9 @@
 # ANY KIND, either express or implied. See the Licence for the specific language
 # governing permissions and limitations under the Licence.
 #
-
 org.gradle.jvmargs=-Xmx8192m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
-android.enableR8.fullMode=false
+android.enableR8.fullMode=false
+toolChainResolverVersion=1.0.0

settings.gradle.kts

@@ -15,13 +15,18 @@
  */
 
 pluginManagement {
+    val toolChainResolverVersion: String by extra
+    plugins {
+        id("org.gradle.toolchains.foojay-resolver-convention") version toolChainResolverVersion
+    }
     includeBuild("build-logic")
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
 }
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -38,6 +43,10 @@ dependencyResolutionManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention")
+}
+
 rootProject.name = "EUDI Wallet"
 include(":app")
 include(":business-logic")