Update gradle version

Fixed a few warning in the gradle file, and moved android test
to unit test folder.

Author: dpad85

gradle/libs.versions.toml

@@ -39,7 +39,7 @@ playservices = "18.9.0"
 junit = "4.13.2"
 espresso = "3.7.0"
 robolectric = "4.13"
-agp = "8.12.3"
+agp = "8.13.2"
 
 [libraries]
 agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-all.zip

phoenix-android/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.ByteArrayOutputStream
 
 plugins {
@@ -8,14 +9,8 @@ plugins {
     alias(libs.plugins.compose)
 }
 
-fun gitCommitHash(): String {
-    val stream = ByteArrayOutputStream()
-    project.exec {
-        commandLine = "git rev-parse --verify --short HEAD".split(" ")
-        standardOutput = stream
-    }
-    return String(stream.toByteArray()).split("\n").first()
-}
+fun gitCommitHash(): String = providers.exec { commandLine("git", "rev-parse", "--verify", "--short", "HEAD") }
+    .standardOutput.asText.get().trim()
 
 val chain: String by project
 
@@ -66,11 +61,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = freeCompilerArgs + "-opt-in=androidx.constraintlayout.compose.ExperimentalMotionApi"
-    }
-
     buildFeatures {
         compose = true
         viewBinding = true
@@ -84,6 +74,10 @@ android {
 }
 
 kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget("1.8")
+        freeCompilerArgs.add("-opt-in=androidx.constraintlayout.compose.ExperimentalMotionApi")
+    }
     target {
         compilerOptions {
             optIn.addAll("kotlin.RequiresOptIn")

…inq/phoenix/utils/AmountFormatterTest.kt …inq/phoenix/utils/AmountFormatterTest.ktphoenix-android/src/androidTest/kotlin/fr/acinq/phoenix/utils/AmountFormatterTest.kt renamed to phoenix-android/src/test/kotlin/fr/acinq/phoenix/utils/AmountFormatterTest.kt phoenix-android/src/androidTest/kotlin/fr/acinq/phoenix/utils/AmountFormatterTest.kt renamed to phoenix-android/src/test/kotlin/fr/acinq/phoenix/utils/AmountFormatterTest.kt

@@ -17,12 +17,12 @@
 package fr.acinq.phoenix.utils
 
 import fr.acinq.lightning.utils.msat
-import fr.acinq.phoenix.android.utils.converters.AmountFormatter.toMilliSatoshi
+import fr.acinq.phoenix.android.utils.converters.AmountConverter.toMilliSatoshi
 import fr.acinq.phoenix.data.BitcoinUnit
-import junit.framework.Assert.assertEquals
+import junit.framework.TestCase.assertEquals
 import org.junit.Test
 
-class AmountFormatterTest {
+class AmountConverterTest {
     @Test
     fun test_double_to_msat_rounding() {
         // 1 msat

phoenix-shared/build.gradle.kts

@@ -14,15 +14,8 @@ plugins {
 
 val includeAndroid = System.getProperty("includeAndroid")?.toBoolean() ?: false
 
-/** Get the current git commit hash. */
-fun gitCommitHash(): String {
-    val stream = ByteArrayOutputStream()
-    project.exec {
-        commandLine = "git rev-parse --verify --long HEAD".split(" ")
-        standardOutput = stream
-    }
-    return String(stream.toByteArray()).split("\n").first()
-}
+fun gitCommitHash(): String = providers.exec { commandLine("git", "rev-parse", "--verify", "--short", "HEAD") }
+    .standardOutput.asText.get().trim()
 
 /**
  * Generates a `BuildVersions` file in phoenix-shared/build/generated-src containing the current git commit and the lightning-kmp version.