diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index ba9c21a..f65965b 100755 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -1,3 +1,6 @@ +import java.util.Properties +import java.io.FileInputStream + plugins { id("com.android.application") id("kotlin-android") @@ -14,9 +17,9 @@ dependencies { // Load release signing properties if key.properties exists (set by CI pipeline) val keystorePropertiesFile = rootProject.file("key.properties") -val keystoreProperties = java.util.Properties() +val keystoreProperties = Properties() if (keystorePropertiesFile.exists()) { - keystoreProperties.load(java.io.FileInputStream(keystorePropertiesFile)) + keystoreProperties.load(FileInputStream(keystorePropertiesFile)) } android { @@ -30,7 +33,7 @@ android { } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = "17" } defaultConfig { @@ -47,10 +50,10 @@ android { signingConfigs { create("release") { if (keystorePropertiesFile.exists()) { - keyAlias = keystoreProperties["keyAlias"] as String - keyPassword = keystoreProperties["keyPassword"] as String - storeFile = file(keystoreProperties["storeFile"] as String) - storePassword = keystoreProperties["storePassword"] as String + keyAlias = keystoreProperties.getProperty("keyAlias") + keyPassword = keystoreProperties.getProperty("keyPassword") + storeFile = file(keystoreProperties.getProperty("storeFile")) + storePassword = keystoreProperties.getProperty("storePassword") } } } diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index ca7fe06..a70cbf3 100755 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -1,7 +1,9 @@ +import java.util.Properties + pluginManagement { val flutterSdkPath = run { - val properties = java.util.Properties() + val properties = Properties() file("local.properties").inputStream().use { properties.load(it) } val flutterSdkPath = properties.getProperty("flutter.sdk") require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }